diff --git a/apps/admin/app/dashboard/trails/page.tsx b/apps/admin/app/dashboard/trails/page.tsx
index f7c73ab163..e0b4bfd524 100644
--- a/apps/admin/app/dashboard/trails/page.tsx
+++ b/apps/admin/app/dashboard/trails/page.tsx
@@ -62,7 +62,7 @@ function TrailSearchSection({
   const [activeSport, setActiveSport] = useState('');
 
   const { data, isLoading, isError } = useQuery({
-    queryKey: queryKeys.osm.search(activeQ, activeSport || undefined),
+    queryKey: queryKeys.osm.search({ q: activeQ, sport: activeSport || undefined }),
     queryFn: () => searchTrails({ q: activeQ, sport: activeSport || undefined }),
     enabled: activeQ.length > 0,
   });
diff --git a/apps/admin/components/analytics/catalog-analytics.tsx b/apps/admin/components/analytics/catalog-analytics.tsx
index d4f5921342..3ca0fa8461 100644
--- a/apps/admin/components/analytics/catalog-analytics.tsx
+++ b/apps/admin/components/analytics/catalog-analytics.tsx
@@ -67,7 +67,7 @@ function statusBadgeVariant(status: string): 'default' | 'secondary' | 'destruct
 
 function EtlJobFailuresDialog({ jobId, totalInvalid }: { jobId: string; totalInvalid: number }) {
   const [open, setOpen] = useState(false);
-  const { data, isLoading } = useEtlJobFailures(jobId, { enabled: open });
+  const { data, isLoading } = useEtlJobFailures({ jobId, opts: { enabled: open } });
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
diff --git a/apps/admin/components/analytics/platform-analytics.tsx b/apps/admin/components/analytics/platform-analytics.tsx
index b71faa893c..ce1f241a85 100644
--- a/apps/admin/components/analytics/platform-analytics.tsx
+++ b/apps/admin/components/analytics/platform-analytics.tsx
@@ -60,7 +60,7 @@ const BREAKDOWN_COLORS = [
 type Period = 'day' | 'week' | 'month';
 const PERIODS = ['day', 'week', 'month'] as const satisfies readonly Period[];
 
-function formatPeriodLabel(v: string, period: Period) {
+function formatPeriodLabel({ v, period }: { v: string; period: Period }) {
   const d = new Date(v);
   if (period === 'day') return d.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
   if (period === 'week') return d.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
@@ -122,7 +122,7 @@ export function PlatformAnalytics() {
                   dataKey="period"
                   tickLine={false}
                   axisLine={false}
-                  tickFormatter={(v: string) => formatPeriodLabel(v, period)}
+                  tickFormatter={(v: string) => formatPeriodLabel({ v, period })}
                 />
                 <YAxis tickLine={false} axisLine={false} width={40} />
                 <ChartTooltip content={<ChartTooltipContent />} />
@@ -177,7 +177,7 @@ export function PlatformAnalytics() {
                   dataKey="period"
                   tickLine={false}
                   axisLine={false}
-                  tickFormatter={(v: string) => formatPeriodLabel(v, period)}
+                  tickFormatter={(v: string) => formatPeriodLabel({ v, period })}
                 />
                 <YAxis tickLine={false} axisLine={false} width={40} />
                 <ChartTooltip content={<ChartTooltipContent />} />
diff --git a/apps/admin/components/edit-catalog-dialog.tsx b/apps/admin/components/edit-catalog-dialog.tsx
index 7019e07d03..24cf1c16f3 100644
--- a/apps/admin/components/edit-catalog-dialog.tsx
+++ b/apps/admin/components/edit-catalog-dialog.tsx
@@ -12,7 +12,7 @@ import {
 import { Input } from '@packrat/web-ui/components/input';
 import { Label } from '@packrat/web-ui/components/label';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import type { AdminCatalogItem } from 'admin-app/lib/api';
+import type { AdminCatalogItem, UpdateCatalogItemInput } from 'admin-app/lib/api';
 import { updateCatalogItem } from 'admin-app/lib/api';
 import { queryKeys } from 'admin-app/lib/queryKeys';
 import { Pencil } from 'lucide-react';
@@ -27,7 +27,7 @@ export function EditCatalogDialog({ item }: EditCatalogDialogProps) {
   const queryClient = useQueryClient();
 
   const { mutate, isPending } = useMutation({
-    mutationFn: (data: Parameters<typeof updateCatalogItem>[1]) => updateCatalogItem(item.id, data),
+    mutationFn: (data: UpdateCatalogItemInput) => updateCatalogItem({ id: item.id, body: data }),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.admin.catalog.all() });
       setOpen(false);
diff --git a/apps/admin/hooks/use-catalog-analytics.ts b/apps/admin/hooks/use-catalog-analytics.ts
index c45b990897..455c392c41 100644
--- a/apps/admin/hooks/use-catalog-analytics.ts
+++ b/apps/admin/hooks/use-catalog-analytics.ts
@@ -54,11 +54,17 @@ export function useEtlFailureSummary(limit = 20) {
   });
 }
 
-export function useEtlJobFailures(jobId: string, opts: { enabled?: boolean; limit?: number } = {}) {
+export function useEtlJobFailures({
+  jobId,
+  opts = {},
+}: {
+  jobId: string;
+  opts?: { enabled?: boolean; limit?: number };
+}) {
   const { enabled = false, limit = 50 } = opts;
   return useQuery({
-    queryKey: queryKeys.catalogAnalytics.etl.jobFailures(jobId, limit),
-    queryFn: () => getEtlJobFailures(jobId, limit),
+    queryKey: queryKeys.catalogAnalytics.etl.jobFailures({ jobId, limit }),
+    queryFn: () => getEtlJobFailures({ jobId, limit }),
     enabled,
   });
 }
diff --git a/apps/admin/hooks/use-platform-analytics.ts b/apps/admin/hooks/use-platform-analytics.ts
index 68f889eea4..de394708dc 100644
--- a/apps/admin/hooks/use-platform-analytics.ts
+++ b/apps/admin/hooks/use-platform-analytics.ts
@@ -7,14 +7,14 @@ import { queryKeys } from 'admin-app/lib/queryKeys';
 export function usePlatformGrowth(period: 'day' | 'week' | 'month') {
   return useQuery({
     queryKey: queryKeys.platform.growth(period),
-    queryFn: () => getPlatformGrowth(period),
+    queryFn: () => getPlatformGrowth({ period }),
   });
 }
 
 export function usePlatformActivity(period: 'day' | 'week' | 'month') {
   return useQuery({
     queryKey: queryKeys.platform.activity(period),
-    queryFn: () => getPlatformActivity(period),
+    queryFn: () => getPlatformActivity({ period }),
   });
 }
 
diff --git a/apps/admin/lib/api.ts b/apps/admin/lib/api.ts
index f5d7810585..a67a16efb2 100644
--- a/apps/admin/lib/api.ts
+++ b/apps/admin/lib/api.ts
@@ -29,7 +29,13 @@ import { adminEnv } from './env';
 const API_BASE = adminEnv.NEXT_PUBLIC_API_URL;
 
 // Injects admin auth header and redirects to /login on 401.
-const adminFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
+const adminFetcher = async ({
+  input,
+  init,
+}: {
+  input: RequestInfo | URL;
+  init?: RequestInit;
+}): Promise<Response> => {
   const authHeader = getAuthHeader();
   const headers = new Headers(init?.headers);
   headers.set('Content-Type', 'application/json');
@@ -46,18 +52,24 @@ const adminFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promi
 
 // Pre-drilled into .api.admin so call sites write `adminClient.stats.get()`.
 const adminClient = treaty<App>(API_BASE, {
-  fetcher: adminFetcher as unknown as typeof fetch,
+  fetcher: ((input, init) => adminFetcher({ input, init })) as unknown as typeof fetch,
   parseDate: false,
 }).api.admin;
 
-function throwOnError(error: { value?: unknown } | null, fallback = 'Admin API error'): never {
+function throwOnError({
+  error,
+  fallback = 'Admin API error',
+}: {
+  error: { value?: unknown } | null;
+  fallback?: string;
+}): never {
   const val = error?.value;
   const msg =
     isObject(val) && 'error' in val ? String((val as { error: unknown }).error) : fallback;
   throw new Error(msg);
 }
 
-function unwrap<T>(data: T | null | undefined, name: string): T {
+function unwrap<T>({ data, name }: { data: T | null | undefined; name: string }): T {
   if (data == null) throw new Error(`Admin API returned no data for ${name}`);
   return data;
 }
@@ -68,8 +80,8 @@ export type { AdminStats };
 
 export async function getStats(): Promise<AdminStats> {
   const { data, error } = await adminClient.stats.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'stats');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'stats' });
 }
 
 // ─── Users ────────────────────────────────────────────────────────────────────
@@ -101,29 +113,32 @@ export async function getUsers({
   const { data, error } = await adminClient['users-list'].get({
     query: { limit, offset, q },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'users');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'users' });
 }
 
 export async function deleteUser(id: string): Promise<{ success: boolean }> {
   const { data, error } = await adminClient.users({ id }).delete();
-  if (error) throwOnError(error);
-  return unwrap(data, 'deleteUser');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'deleteUser' });
 }
 
-export async function hardDeleteUser(
-  id: string,
-  reason: string,
-): Promise<{ success: boolean; purged: boolean }> {
+export async function hardDeleteUser({
+  id,
+  reason,
+}: {
+  id: string;
+  reason: string;
+}): Promise<{ success: boolean; purged: boolean }> {
   const { data, error } = await adminClient.users({ id }).hard.delete({ reason });
-  if (error) throwOnError(error);
-  return unwrap(data, 'hardDeleteUser');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'hardDeleteUser' });
 }
 
 export async function restoreUser(id: string): Promise<{ success: boolean }> {
   const { data, error } = await adminClient.users({ id }).restore.post();
-  if (error) throwOnError(error);
-  return unwrap(data, 'restoreUser');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'restoreUser' });
 }
 
 // ─── Packs ────────────────────────────────────────────────────────────────────
@@ -144,14 +159,14 @@ export async function getPacks({
   const { data, error } = await adminClient['packs-list'].get({
     query: { limit, offset, q, includeDeleted },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'packs');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'packs' });
 }
 
 export async function deletePack(id: string): Promise<{ success: boolean }> {
   const { data, error } = await adminClient.packs({ id }).delete();
-  if (error) throwOnError(error);
-  return unwrap(data, 'deletePack');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'deletePack' });
 }
 
 // ─── Catalog Items ────────────────────────────────────────────────────────────
@@ -180,23 +195,26 @@ export async function getCatalogItems({
   const { data, error } = await adminClient['catalog-list'].get({
     query: { limit, offset, q },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalog');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalog' });
 }
 
 export async function deleteCatalogItem(id: number): Promise<{ success: boolean }> {
   const { data, error } = await adminClient.catalog({ id: String(id) }).delete();
-  if (error) throwOnError(error);
-  return unwrap(data, 'deleteCatalogItem');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'deleteCatalogItem' });
 }
 
-export async function updateCatalogItem(
-  id: number,
-  body: UpdateCatalogItemInput,
-): Promise<{ id: number; name: string }> {
+export async function updateCatalogItem({
+  id,
+  body,
+}: {
+  id: number;
+  body: UpdateCatalogItemInput;
+}): Promise<{ id: number; name: string }> {
   const { data, error } = await adminClient.catalog({ id: String(id) }).patch(body);
-  if (error) throwOnError(error);
-  return unwrap(data, 'updateCatalogItem');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'updateCatalogItem' });
 }
 
 // ─── Analytics — Platform ─────────────────────────────────────────────────────
@@ -204,32 +222,38 @@ export async function updateCatalogItem(
 export type { GrowthPoint, ActivityPoint, BreakdownItem, ActiveUsers };
 export type AnalyticsPeriod = 'day' | 'week' | 'month';
 
-export async function getPlatformGrowth(
-  period: AnalyticsPeriod,
+export async function getPlatformGrowth({
+  period,
   range = 12,
-): Promise<GrowthPoint[]> {
+}: {
+  period: AnalyticsPeriod;
+  range?: number;
+}): Promise<GrowthPoint[]> {
   const { data, error } = await adminClient.analytics.platform.growth.get({
     query: { period, range },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'platformGrowth');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'platformGrowth' });
 }
 
-export async function getPlatformActivity(
-  period: AnalyticsPeriod,
+export async function getPlatformActivity({
+  period,
   range = 12,
-): Promise<ActivityPoint[]> {
+}: {
+  period: AnalyticsPeriod;
+  range?: number;
+}): Promise<ActivityPoint[]> {
   const { data, error } = await adminClient.analytics.platform.activity.get({
     query: { period, range },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'platformActivity');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'platformActivity' });
 }
 
 export async function getPlatformBreakdown(): Promise<BreakdownItem[]> {
   const { data, error } = await adminClient.analytics.platform.breakdown.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'platformBreakdown');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'platformBreakdown' });
 }
 
 // ─── Analytics — Catalog ─────────────────────────────────────────────────────
@@ -238,36 +262,36 @@ export type { CatalogOverview, BrandRow, PriceBucket, EtlJob, EtlResponse, Embed
 
 export async function getCatalogOverview(): Promise<CatalogOverview> {
   const { data, error } = await adminClient.analytics.catalog.overview.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalogOverview');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalogOverview' });
 }
 
 export async function getCatalogBrands(limit = 20): Promise<BrandRow[]> {
   const { data, error } = await adminClient.analytics.catalog.brands.get({
     query: { limit },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalogBrands');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalogBrands' });
 }
 
 export async function getCatalogPrices(): Promise<PriceBucket[]> {
   const { data, error } = await adminClient.analytics.catalog.prices.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalogPrices');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalogPrices' });
 }
 
 export async function getCatalogEtl(limit = 20): Promise<EtlResponse> {
   const { data, error } = await adminClient.analytics.catalog.etl.get({
     query: { limit },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalogEtl');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalogEtl' });
 }
 
 export async function getCatalogEmbeddings(): Promise<EmbeddingStats> {
   const { data, error } = await adminClient.analytics.catalog.embeddings.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'catalogEmbeddings');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'catalogEmbeddings' });
 }
 
 // ─── Admin Trails ─────────────────────────────────────────────────────────────
@@ -291,20 +315,20 @@ export async function searchTrails({
   const { data, error } = await adminClient.trails.search.get({
     query: { q, sport, limit, offset },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'searchTrails');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'searchTrails' });
 }
 
 export async function getTrailGeometry(osmId: string): Promise<TrailGeometry> {
   const { data, error } = await adminClient.trails({ osmId }).geometry.get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'trailGeometry');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'trailGeometry' });
 }
 
 export async function getAdminTrail(osmId: string): Promise<TrailSearchResult> {
   const { data, error } = await adminClient.trails({ osmId }).get();
-  if (error) throwOnError(error);
-  return unwrap(data, 'adminTrail');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'adminTrail' });
 }
 
 export async function getTrailConditions({
@@ -321,40 +345,53 @@ export async function getTrailConditions({
   const { data, error } = await adminClient.trails.conditions.get({
     query: { q, limit, offset, includeDeleted },
   });
-  if (error) throwOnError(error);
-  return unwrap(data, 'trailConditions');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'trailConditions' });
 }
 
 export async function deleteTrailCondition(reportId: string): Promise<{ success: boolean }> {
   const { data, error } = await adminClient.trails.conditions({ reportId }).delete();
-  if (error) throwOnError(error);
-  return unwrap(data, 'deleteTrailCondition');
+  if (error) throwOnError({ error });
+  return unwrap({ data, name: 'deleteTrailCondition' });
 }
 
-async function adminFetch<T>(path: string, init?: RequestInit): Promise<T> {
-  const res = await adminFetcher(`${API_BASE}/api/admin${path}`, init);
-  if (!res.ok) throw new Error(`Admin API error: ${res.status}`);
+async function adminFetch<T>({ path, init }: { path: string; init?: RequestInit }): Promise<T> {
+  const res = await adminFetcher({ input: `${API_BASE}/api/admin${path}`, init });
+  if (!res.ok) {
+    const body = (await res.json().catch(() => ({}))) as { error?: string };
+    throw new Error(body.error ?? `Admin API error: ${res.status}`);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return res.json();
 }
 
 export function resetStuckEtlJobs(): Promise<{ reset: number; ids: string[] }> {
-  return adminFetch('/analytics/catalog/etl/reset-stuck', { method: 'POST' });
+  return adminFetch({ path: '/analytics/catalog/etl/reset-stuck', init: { method: 'POST' } });
 }
 
 export type { EtlFailureSummary, EtlJobFailures };
 
 export function getEtlFailureSummary(limit = 20): Promise<EtlFailureSummary> {
-  return adminFetch(`/analytics/catalog/etl/failure-summary?limit=${limit}`);
+  return adminFetch({ path: `/analytics/catalog/etl/failure-summary?limit=${limit}` });
 }
 
-export function getEtlJobFailures(jobId: string, limit = 50): Promise<EtlJobFailures> {
-  return adminFetch(`/analytics/catalog/etl/${encodeURIComponent(jobId)}/failures?limit=${limit}`);
+export function getEtlJobFailures({
+  jobId,
+  limit = 50,
+}: {
+  jobId: string;
+  limit?: number;
+}): Promise<EtlJobFailures> {
+  return adminFetch({
+    path: `/analytics/catalog/etl/${encodeURIComponent(jobId)}/failures?limit=${limit}`,
+  });
 }
 
 export function retryEtlJob(
   jobId: string,
 ): Promise<{ success: boolean; newJobId: string; objectKey: string }> {
-  return adminFetch(`/analytics/catalog/etl/${encodeURIComponent(jobId)}/retry`, {
-    method: 'POST',
+  return adminFetch({
+    path: `/analytics/catalog/etl/${encodeURIComponent(jobId)}/retry`,
+    init: { method: 'POST' },
   });
 }
diff --git a/apps/admin/lib/auth.ts b/apps/admin/lib/auth.ts
index 76dfee73d5..349d1927a4 100644
--- a/apps/admin/lib/auth.ts
+++ b/apps/admin/lib/auth.ts
@@ -9,7 +9,7 @@ export function getStoredToken(): string | null {
 
 /** Persist a short-lived admin JWT for the session. */
 export function storeToken(token: string): void {
-  safeSessionStorage.setItem(TOKEN_KEY, token);
+  safeSessionStorage.setItem({ key: TOKEN_KEY, value: token });
 }
 
 /** Remove the token (logout). */
diff --git a/apps/admin/lib/queryKeys.ts b/apps/admin/lib/queryKeys.ts
index ef1038b37d..e81ac3b578 100644
--- a/apps/admin/lib/queryKeys.ts
+++ b/apps/admin/lib/queryKeys.ts
@@ -39,7 +39,8 @@ export const queryKeys = {
 
   osm: {
     all: () => ['osm'] as const,
-    search: (q?: string, sport?: string) => [...queryKeys.osm.all(), 'search', q, sport] as const,
+    search: ({ q, sport }: { q: string; sport?: string }) =>
+      [...queryKeys.osm.all(), 'search', q, sport] as const,
     trail: (osmId: string) => [...queryKeys.osm.all(), 'trail', osmId] as const,
     conditions: (q?: string) => [...queryKeys.osm.all(), 'conditions', q] as const,
   },
@@ -56,7 +57,7 @@ export const queryKeys = {
       list: (limit?: number) => [...queryKeys.catalogAnalytics.etl.all(), limit] as const,
       failureSummary: (limit?: number) =>
         [...queryKeys.catalogAnalytics.etl.all(), 'failureSummary', limit] as const,
-      jobFailures: (jobId: string, limit?: number) =>
+      jobFailures: ({ jobId, limit }: { jobId: string; limit?: number }) =>
         [...queryKeys.catalogAnalytics.etl.all(), 'jobFailures', jobId, limit] as const,
     },
   },
diff --git a/apps/expo/app/(app)/(tabs)/profile/index.tsx b/apps/expo/app/(app)/(tabs)/profile/index.tsx
index ef91c30016..49c7871acf 100644
--- a/apps/expo/app/(app)/(tabs)/profile/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/index.tsx
@@ -134,7 +134,7 @@ function Profile() {
   );
 }
 
-export default withAuthWall(Profile, ProfileAuthWall);
+export default withAuthWall({ Component: Profile, AuthWall: ProfileAuthWall });
 
 function renderItem(info: ListRenderItemInfo<DataItem>) {
   return <Item info={info} />;
@@ -194,7 +194,7 @@ function ListHeaderComponent() {
       }
 
       setIsUploading(true);
-      const remoteFileName = await uploadImage(image.fileName, image.uri);
+      const remoteFileName = await uploadImage({ fileName: image.fileName, uri: image.uri });
       if (remoteFileName) {
         const success = await updateProfile({ avatarUrl: remoteFileName });
         if (!success) {
diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx
index 18e2607be5..c20d4050fb 100644
--- a/apps/expo/app/(app)/ai-chat.tsx
+++ b/apps/expo/app/(app)/ai-chat.tsx
@@ -250,7 +250,7 @@ export default function AIChat() {
     }
 
     const timeoutId = setTimeout(() => {
-      saveChatMessages(context, messages);
+      saveChatMessages({ context, messages });
     }, 500);
 
     return () => clearTimeout(timeoutId);
diff --git a/apps/expo/app/(app)/current-pack/[id].tsx b/apps/expo/app/(app)/current-pack/[id].tsx
index f5fe095587..8bfaa24636 100644
--- a/apps/expo/app/(app)/current-pack/[id].tsx
+++ b/apps/expo/app/(app)/current-pack/[id].tsx
@@ -155,7 +155,7 @@ export default function CurrentPackScreen() {
             </Text>
             <Text variant="subhead" className="mt-1 text-muted-foreground">
               {t('packs.lastUpdated', {
-                time: getRelativeTime(pack.localUpdatedAt ?? pack.updatedAt, t),
+                time: getRelativeTime({ dateValue: pack.localUpdatedAt ?? pack.updatedAt, t }),
               })}
             </Text>
           </View>
diff --git a/apps/expo/app/(app)/recent-packs.tsx b/apps/expo/app/(app)/recent-packs.tsx
index 20fa2db13a..46811d70eb 100644
--- a/apps/expo/app/(app)/recent-packs.tsx
+++ b/apps/expo/app/(app)/recent-packs.tsx
@@ -34,7 +34,7 @@ function RecentPackCard({ pack }: { pack: Pack }) {
               {pack.totalWeight ?? 0} g
             </Text>
             <Text variant="footnote" className="text-muted-foreground">
-              {getRelativeTime(pack.localCreatedAt ?? pack.createdAt, t)}
+              {getRelativeTime({ dateValue: pack.localCreatedAt ?? pack.createdAt, t })}
             </Text>
           </View>
         </View>
@@ -45,7 +45,7 @@ function RecentPackCard({ pack }: { pack: Pack }) {
           </View>
           <Text variant="caption1" className="text-muted-foreground">
             {t('packs.lastUpdated', {
-              time: getRelativeTime(pack.localUpdatedAt ?? pack.updatedAt, t),
+              time: getRelativeTime({ dateValue: pack.localUpdatedAt ?? pack.updatedAt, t }),
             })}
           </Text>
         </View>
diff --git a/apps/expo/app/(app)/season-suggestions.tsx b/apps/expo/app/(app)/season-suggestions.tsx
index fda46f799e..8960d73c47 100644
--- a/apps/expo/app/(app)/season-suggestions.tsx
+++ b/apps/expo/app/(app)/season-suggestions.tsx
@@ -34,7 +34,13 @@ export default function SeasonSuggestionsScreen() {
     });
   };
 
-  const handleCreatePack = (suggestion: PackSuggestion, index: number) => {
+  const handleCreatePack = ({
+    suggestion,
+    index,
+  }: {
+    suggestion: PackSuggestion;
+    index: number;
+  }) => {
     setCreatingPackIndex(index);
 
     // Add a short delay to show the loading state
@@ -154,7 +160,7 @@ export default function SeasonSuggestionsScreen() {
 
                   <Button
                     variant="secondary"
-                    onPress={() => handleCreatePack(suggestion, index)}
+                    onPress={() => handleCreatePack({ suggestion, index })}
                     disabled={creatingPackIndex === index}
                     className="w-full"
                   >
diff --git a/apps/expo/app/(app)/upcoming-trips.tsx b/apps/expo/app/(app)/upcoming-trips.tsx
index 158e218331..0183072775 100644
--- a/apps/expo/app/(app)/upcoming-trips.tsx
+++ b/apps/expo/app/(app)/upcoming-trips.tsx
@@ -16,7 +16,13 @@ function formatDate(dateString?: string) {
 }
 
 // Calculate trip status based on dates
-function getTripStatus(trip: { startDate?: string; endDate?: string }, t: TranslationFunction) {
+function getTripStatus({
+  trip,
+  t,
+}: {
+  trip: { startDate?: string; endDate?: string };
+  t: TranslationFunction;
+}) {
   if (!trip.startDate || !trip.endDate) return { status: t('trips.notStarted'), completion: 0 };
 
   const start = new Date(trip.startDate).getTime();
@@ -173,7 +179,7 @@ function UpcomingTripsScreenInner() {
         keyExtractor={(item) => item.id}
         renderItem={(info) => {
           const { trip } = info.item;
-          const { status, completion } = getTripStatus(trip, t);
+          const { status, completion } = getTripStatus({ trip, t });
 
           return (
             <ListItem
diff --git a/apps/expo/app/auth/(login)/index.tsx b/apps/expo/app/auth/(login)/index.tsx
index 16d09d682b..4f94cff694 100644
--- a/apps/expo/app/auth/(login)/index.tsx
+++ b/apps/expo/app/auth/(login)/index.tsx
@@ -47,7 +47,7 @@ export default function LoginScreen() {
     onSubmit: async ({ value }) => {
       try {
         setIsLoading(true);
-        await signIn(value.email, value.password);
+        await signIn({ email: value.email, password: value.password });
         // Navigation is handled in function after successful login
       } catch (error) {
         setIsLoading(false);
diff --git a/apps/expo/app/auth/(login)/reset-password.tsx b/apps/expo/app/auth/(login)/reset-password.tsx
index 6571fab95b..6a3037b5d7 100644
--- a/apps/expo/app/auth/(login)/reset-password.tsx
+++ b/apps/expo/app/auth/(login)/reset-password.tsx
@@ -136,7 +136,10 @@ export default function ResetPasswordScreen() {
         setIsLoading(true);
 
         // Call the API to reset the password
-        await resetPassword(params.email, { token: params.code, newPassword: value.password });
+        await resetPassword({
+          email: params.email,
+          opts: { token: params.code, newPassword: value.password },
+        });
 
         // Show success message and navigate to login
         Alert.alert(t('common.success'), t('auth.resetPasswordSuccess'), [
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index 57222fc452..d1b2b4ed65 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -135,7 +135,7 @@ export default function OneTimePasswordScreen() {
           params: { email, code },
         });
       } else {
-        await verifyEmail(email, code); // Navigation is handled in the function
+        await verifyEmail({ _email: email, token: code }); // Navigation is handled in the function
       }
     } catch (error) {
       Alert.alert(
@@ -254,7 +254,7 @@ function OTPField({
   const inputRef = React.useRef<TextInput>(null);
 
   // Apply keyboard hide blur fix
-  useKeyboardHideBlur(asNonNullableRef(inputRef));
+  useKeyboardHideBlur({ textInputRef: asNonNullableRef(inputRef) });
 
   function onKeyPress({ nativeEvent }: NativeSyntheticEvent<TextInputKeyPressEventData>) {
     if (nativeEvent.key === 'Backspace' && value === '') {
diff --git a/apps/expo/atoms/atomWithAsyncStorage.ts b/apps/expo/atoms/atomWithAsyncStorage.ts
index 15c69840e8..49060418e7 100644
--- a/apps/expo/atoms/atomWithAsyncStorage.ts
+++ b/apps/expo/atoms/atomWithAsyncStorage.ts
@@ -2,7 +2,13 @@ import { isFunction } from '@packrat/guards';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { atom } from 'jotai';
 
-export const atomWithAsyncStorage = <T>(key: string, initialValue: T) => {
+export const atomWithAsyncStorage = <T>({
+  key,
+  initialValue,
+}: {
+  key: string;
+  initialValue: T;
+}) => {
   const baseAtom = atom(initialValue);
 
   baseAtom.onMount = (setValue) => {
diff --git a/apps/expo/atoms/atomWithKvStorage.ts b/apps/expo/atoms/atomWithKvStorage.ts
index 35d2f1979d..886827e7d7 100644
--- a/apps/expo/atoms/atomWithKvStorage.ts
+++ b/apps/expo/atoms/atomWithKvStorage.ts
@@ -2,7 +2,7 @@ import { isFunction } from '@packrat/guards';
 import Storage from 'expo-sqlite/kv-store';
 import { atom } from 'jotai';
 
-export const atomWithKvStorage = <T>(key: string, initialValue: T) => {
+export const atomWithKvStorage = <T>({ key, initialValue }: { key: string; initialValue: T }) => {
   const baseAtom = atom(initialValue);
 
   baseAtom.onMount = (setValue) => {
diff --git a/apps/expo/atoms/atomWithSecureStorage.ts b/apps/expo/atoms/atomWithSecureStorage.ts
index c410894c00..b76543d317 100644
--- a/apps/expo/atoms/atomWithSecureStorage.ts
+++ b/apps/expo/atoms/atomWithSecureStorage.ts
@@ -2,7 +2,13 @@ import { isFunction } from '@packrat/guards';
 import * as SecureStore from 'expo-secure-store';
 import { atom } from 'jotai';
 
-export const atomWithSecureStorage = <T>(key: string, initialValue: T) => {
+export const atomWithSecureStorage = <T>({
+  key,
+  initialValue,
+}: {
+  key: string;
+  initialValue: T;
+}) => {
   const baseAtom = atom(initialValue);
 
   baseAtom.onMount = (setValue) => {
diff --git a/apps/expo/atoms/atomWithSecureStorage.web.ts b/apps/expo/atoms/atomWithSecureStorage.web.ts
index 42680c86cf..f54b9176f3 100644
--- a/apps/expo/atoms/atomWithSecureStorage.web.ts
+++ b/apps/expo/atoms/atomWithSecureStorage.web.ts
@@ -7,7 +7,13 @@ import { atom } from 'jotai';
  * fallback for web; sensitive flows should use server-side sessions on web.
  * Metro automatically picks this file over atomWithSecureStorage.ts for web builds.
  */
-export const atomWithSecureStorage = <T>(key: string, initialValue: T) => {
+export const atomWithSecureStorage = <T>({
+  key,
+  initialValue,
+}: {
+  key: string;
+  initialValue: T;
+}) => {
   const baseAtom = atom(initialValue);
 
   baseAtom.onMount = (setValue) => {
diff --git a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
index 701ccea101..853d2ab559 100644
--- a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
+++ b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
@@ -3,15 +3,18 @@ import { atomWithAsyncStorage } from './atomWithAsyncStorage';
 
 const MAX_RECENTLY_USED = 10;
 
-export const recentlyUsedCatalogItemsAtom = atomWithAsyncStorage<CatalogItem[]>(
-  'recentlyUsedCatalogItems',
-  [],
-);
+export const recentlyUsedCatalogItemsAtom = atomWithAsyncStorage<CatalogItem[]>({
+  key: 'recentlyUsedCatalogItems',
+  initialValue: [],
+});
 
-export function buildUpdatedRecentlyUsed(
-  current: CatalogItem[],
-  added: CatalogItem[],
-): CatalogItem[] {
+export function buildUpdatedRecentlyUsed({
+  current,
+  added,
+}: {
+  current: CatalogItem[];
+  added: CatalogItem[];
+}): CatalogItem[] {
   const addedIds = new Set(added.map((item) => item.id));
   const merged = [...added, ...current.filter((item) => !addedIds.has(item.id))];
   return merged.slice(0, MAX_RECENTLY_USED);
diff --git a/apps/expo/components/Icon/Icon.ios.tsx b/apps/expo/components/Icon/Icon.ios.tsx
index 1472ff8ac1..2e3659658f 100644
--- a/apps/expo/components/Icon/Icon.ios.tsx
+++ b/apps/expo/components/Icon/Icon.ios.tsx
@@ -15,7 +15,7 @@ function Icon({
   materialIcon,
 }: IconProps) {
   const { useMaterialIcon, ...sfSymbolProps } = ios ?? {};
-  const iconNames = useMemo(() => getIconNames(namingScheme, name), [namingScheme, name]);
+  const iconNames = useMemo(() => getIconNames({ namingScheme, name }), [namingScheme, name]);
 
   // Use Material icons on iOS when useMaterialIcon is true
   if (useMaterialIcon) {
diff --git a/apps/expo/components/Icon/Icon.tsx b/apps/expo/components/Icon/Icon.tsx
index 7f5accd2ce..4b29bd7bee 100644
--- a/apps/expo/components/Icon/Icon.tsx
+++ b/apps/expo/components/Icon/Icon.tsx
@@ -12,7 +12,7 @@ function Icon({
   size = 27,
   materialIcon,
 }: IconProps) {
-  const iconNames = useMemo(() => getIconNames(namingScheme, name), [namingScheme, name]);
+  const iconNames = useMemo(() => getIconNames({ namingScheme, name }), [namingScheme, name]);
 
   const prefersMaterialIcons = materialIcon?.type === 'MaterialIcons';
   const prefersMaterialCommunityIcons = materialIcon?.type === 'MaterialCommunityIcons';
diff --git a/apps/expo/components/Icon/get-icon-names.ts b/apps/expo/components/Icon/get-icon-names.ts
index 782683d6b1..a67f2cac99 100644
--- a/apps/expo/components/Icon/get-icon-names.ts
+++ b/apps/expo/components/Icon/get-icon-names.ts
@@ -12,7 +12,13 @@ type IconMapping = {
   materialCommunityIcon: MaterialCommunityIconsProps['name'] | null;
 };
 
-export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: string): IconMapping {
+export function getIconNames({
+  namingScheme,
+  name,
+}: {
+  namingScheme: 'sfSymbol' | 'material';
+  name?: string;
+}): IconMapping {
   if (!name) {
     return {
       sfSymbol: null,
diff --git a/apps/expo/components/SearchInput.tsx b/apps/expo/components/SearchInput.tsx
index a0eda25565..37fded10c8 100644
--- a/apps/expo/components/SearchInput.tsx
+++ b/apps/expo/components/SearchInput.tsx
@@ -15,7 +15,7 @@ export const SearchInput = forwardRef<
   const searchInputRef = useRef<React.ComponentRef<typeof NativeWindUISearchInput>>(null);
 
   // Apply keyboard hide blur fix
-  useKeyboardHideBlur(asNonNullableRef(searchInputRef));
+  useKeyboardHideBlur({ textInputRef: asNonNullableRef(searchInputRef) });
 
   // Forward ref methods to the internal ref
   useImperativeHandle(ref, () => {
diff --git a/apps/expo/components/TextInput.tsx b/apps/expo/components/TextInput.tsx
index 8dd0219ed2..12285a5bc1 100644
--- a/apps/expo/components/TextInput.tsx
+++ b/apps/expo/components/TextInput.tsx
@@ -12,7 +12,7 @@ export const TextInput = forwardRef<RNTextInput, TextInputProps>((props, ref) =>
   const textInputRef = useRef<RNTextInput>(null);
 
   // Apply keyboard hide blur fix
-  useKeyboardHideBlur(asNonNullableRef(textInputRef));
+  useKeyboardHideBlur({ textInputRef: asNonNullableRef(textInputRef) });
 
   // Forward ref methods to the internal ref
   useImperativeHandle(ref, () => {
diff --git a/apps/expo/components/initial/ErrorBoundary.tsx b/apps/expo/components/initial/ErrorBoundary.tsx
index 9f9f893418..26f836efe8 100644
--- a/apps/expo/components/initial/ErrorBoundary.tsx
+++ b/apps/expo/components/initial/ErrorBoundary.tsx
@@ -49,7 +49,7 @@ const DefaultFallback = () => {
 };
 
 export function ErrorBoundary({ children, fallback, onReset, onError }: ErrorBoundaryProps) {
-  const handleError = (error: unknown, info: { componentStack: string }) => {
+  const handleError = ({ error, info }: { error: unknown; info: { componentStack: string } }) => {
     // Log the error to your preferred logging service
     console.error('Error caught by ErrorBoundary:', error);
     console.error('Component stack:', info.componentStack);
@@ -65,7 +65,7 @@ export function ErrorBoundary({ children, fallback, onReset, onError }: ErrorBou
       fallback={fallback ? fallback : DefaultFallback}
       onReset={onReset}
       onError={(error: unknown, componentStack: ErrorInfo['componentStack']) =>
-        handleError(error, { componentStack: componentStack || '' })
+        handleError({ error, info: { componentStack: componentStack || '' } })
       }
     >
       {children}
diff --git a/apps/expo/components/initial/WeightBadge.tsx b/apps/expo/components/initial/WeightBadge.tsx
index 10b58ae0da..d4cd1c2d17 100644
--- a/apps/expo/components/initial/WeightBadge.tsx
+++ b/apps/expo/components/initial/WeightBadge.tsx
@@ -32,7 +32,7 @@ export function WeightBadge({
 
   const safeWeight = Number(weight) || 0;
   const safeUnit = isString(unit) ? unit : 'g';
-  const formattedWeight = formatWeight(safeWeight, safeUnit);
+  const formattedWeight = formatWeight({ weight: safeWeight, unit: safeUnit });
 
   return (
     <View className={cn('rounded-full px-2 py-1', getColorClass()[0], containerClassName)}>
diff --git a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
index 2e6c304fac..a19e6b7b47 100644
--- a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
+++ b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
@@ -21,7 +21,7 @@ export function useGeneratePacks() {
 
   const generatedPacksFromStore = use$(() => {
     if (mutation.data) {
-      return mutation.data.map((pack) => obs(packsStore, pack.id).get());
+      return mutation.data.map((pack) => obs({ store: packsStore, id: pack.id }).get());
     }
     return [];
   });
diff --git a/apps/expo/features/ai/atoms/aiModeAtoms.ts b/apps/expo/features/ai/atoms/aiModeAtoms.ts
index dac4395bcd..ac94dc2feb 100644
--- a/apps/expo/features/ai/atoms/aiModeAtoms.ts
+++ b/apps/expo/features/ai/atoms/aiModeAtoms.ts
@@ -5,7 +5,7 @@ export type AIMode = 'cloud' | 'local';
 export type ModelStatus = 'idle' | 'checking' | 'downloading' | 'preparing' | 'ready' | 'error';
 
 /** Persisted user preference for cloud vs local inference */
-export const aiModeAtom = atomWithAsyncStorage<AIMode>('ai:mode', 'cloud');
+export const aiModeAtom = atomWithAsyncStorage<AIMode>({ key: 'ai:mode', initialValue: 'cloud' });
 
 /** Current status of the local model */
 export const localModelStatusAtom = atom<ModelStatus>('idle');
diff --git a/apps/expo/features/ai/atoms/chatStorageAtoms.ts b/apps/expo/features/ai/atoms/chatStorageAtoms.ts
index 2c25cac0e8..7c9a90a856 100644
--- a/apps/expo/features/ai/atoms/chatStorageAtoms.ts
+++ b/apps/expo/features/ai/atoms/chatStorageAtoms.ts
@@ -82,7 +82,13 @@ export async function loadChatMessages(context: ChatContext): Promise<UIMessage[
  * Saves chat messages to AsyncStorage
  */
 
-export async function saveChatMessages(context: ChatContext, messages: UIMessage[]): Promise<void> {
+export async function saveChatMessages({
+  context,
+  messages,
+}: {
+  context: ChatContext;
+  messages: UIMessage[];
+}): Promise<void> {
   try {
     const key = getChatStorageKey(context);
     await AsyncStorage.setItem(key, JSON.stringify(messages));
diff --git a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
index 29f028586a..365e088672 100644
--- a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
@@ -80,7 +80,7 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP
       .join(' ');
   };
 
-  const truncateText = (text: string, maxLength = 120) => {
+  const truncateText = ({ text, maxLength = 120 }: { text: string; maxLength?: number }) => {
     if (text.length <= maxLength) return text;
     return `${text.substring(0, maxLength).trim()}...`;
   };
@@ -214,7 +214,7 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP
                       className="mb-4 text-sm leading-5 text-gray-700 dark:text-gray-300"
                       numberOfLines={4}
                     >
-                      {truncateText(guide.content[0].text.trim())}
+                      {truncateText({ text: guide.content[0].text.trim() })}
                     </Text>
                   )}
 
diff --git a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
index f56c296cdf..477d8360da 100644
--- a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
@@ -139,10 +139,10 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps
             <View className="mb-4 flex-row items-center justify-between">
               <View className="flex-row items-center">
                 <Icon
-                  name={getWeatherIconByCondition(
-                    toolInvocation.output.data.condition,
-                    toolInvocation.output.data.details.isDay,
-                  )}
+                  name={getWeatherIconByCondition({
+                    condition: toolInvocation.output.data.condition,
+                    isDay: toolInvocation.output.data.details.isDay,
+                  })}
                   size={48}
                   color="#3b82f6"
                 />
diff --git a/apps/expo/features/ai/screens/ReportedContentScreen.tsx b/apps/expo/features/ai/screens/ReportedContentScreen.tsx
index b7e98df99d..8c4fc83e94 100644
--- a/apps/expo/features/ai/screens/ReportedContentScreen.tsx
+++ b/apps/expo/features/ai/screens/ReportedContentScreen.tsx
@@ -26,7 +26,7 @@ export default function ReportedContentScreen() {
     return item.status === selectedFilter;
   });
 
-  const handleReview = (id: string, status: 'reviewed' | 'dismissed') => {
+  const handleReview = ({ id, status }: { id: string; status: 'reviewed' | 'dismissed' }) => {
     updateMutation.mutate({ id, status });
   };
 
@@ -144,7 +144,7 @@ export default function ReportedContentScreen() {
                 <Button
                   variant="tonal"
                   size="sm"
-                  onPress={() => handleReview(item.id, 'dismissed')}
+                  onPress={() => handleReview({ id: item.id, status: 'dismissed' })}
                   disabled={updateMutation.isPending}
                 >
                   <Text>{t('ai.reportedContent.dismiss')}</Text>
@@ -152,7 +152,7 @@ export default function ReportedContentScreen() {
                 <Button
                   variant="primary"
                   size="sm"
-                  onPress={() => handleReview(item.id, 'reviewed')}
+                  onPress={() => handleReview({ id: item.id, status: 'reviewed' })}
                   disabled={updateMutation.isPending}
                 >
                   <Text>{t('ai.reportedContent.resolve')}</Text>
diff --git a/apps/expo/features/auth/hocs/withAuthWall.tsx b/apps/expo/features/auth/hocs/withAuthWall.tsx
index 3d1da79126..f3924e6c49 100644
--- a/apps/expo/features/auth/hocs/withAuthWall.tsx
+++ b/apps/expo/features/auth/hocs/withAuthWall.tsx
@@ -1,7 +1,13 @@
 import type { FC } from 'react';
 import { isAuthed } from '../store';
 
-export function withAuthWall<P extends object>(Component: FC<P>, AuthWall: FC): FC<P> {
+export function withAuthWall<P extends object>({
+  Component,
+  AuthWall,
+}: {
+  Component: FC<P>;
+  AuthWall: FC;
+}): FC<P> {
   return function WrappedComponent(props: P) {
     const isAuthenticated = isAuthed.peek();
 
diff --git a/apps/expo/features/auth/hooks/useAuthActions.ts b/apps/expo/features/auth/hooks/useAuthActions.ts
index 95ed336fae..30a9a189ca 100644
--- a/apps/expo/features/auth/hooks/useAuthActions.ts
+++ b/apps/expo/features/auth/hooks/useAuthActions.ts
@@ -69,7 +69,7 @@ export function useAuthActions() {
     redirect(redirectTo);
   };
 
-  const signIn = async (email: string, password: string) => {
+  const signIn = async ({ email, password }: { email: string; password: string }) => {
     setIsLoading(true);
     try {
       const { data, error } = await authClient.signIn.email({ email, password });
@@ -195,7 +195,12 @@ export function useAuthActions() {
     if (error) throw new Error(error.message ?? 'Forgot password failed');
   };
 
-  const resetPassword = async (_email: string, opts: { token: string; newPassword: string }) => {
+  const resetPassword = async ({
+    opts,
+  }: {
+    email?: string;
+    opts: { token: string; newPassword: string };
+  }) => {
     const { error } = await authClient.resetPassword({
       token: opts.token,
       newPassword: opts.newPassword,
@@ -203,7 +208,7 @@ export function useAuthActions() {
     if (error) throw new Error(error.message ?? 'Reset password failed');
   };
 
-  const verifyEmail = async (_email: string, token: string) => {
+  const verifyEmail = async ({ token }: { _email?: string; token: string }) => {
     const { data, error } = await authClient.verifyEmail({ query: { token } });
     if (error) throw new Error(error.message ?? 'Email verification failed');
 
diff --git a/apps/expo/features/catalog/components/SimilarItems.tsx b/apps/expo/features/catalog/components/SimilarItems.tsx
index 6883533197..31b36e4719 100644
--- a/apps/expo/features/catalog/components/SimilarItems.tsx
+++ b/apps/expo/features/catalog/components/SimilarItems.tsx
@@ -81,9 +81,9 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
 }) => {
   const router = useRouter();
   const { t } = useTranslation();
-  const { data, isLoading, isError } = useSimilarCatalogItems(catalogItemId, {
-    limit,
-    threshold,
+  const { data, isLoading, isError } = useSimilarCatalogItems({
+    id: catalogItemId,
+    params: { limit, threshold },
   });
 
   const handleItemPress = (itemId: string) => {
diff --git a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
index f5db02667c..65582ba51c 100644
--- a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
+++ b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
@@ -11,7 +11,9 @@ export function useRecentlyUsedCatalogItems() {
 
   const trackRecentlyUsed = useCallback(
     (items: CatalogItem[]) => {
-      setRecentItems((current: CatalogItem[]) => buildUpdatedRecentlyUsed(current, items));
+      setRecentItems((current: CatalogItem[]) =>
+        buildUpdatedRecentlyUsed({ current, added: items }),
+      );
     },
     [setRecentItems],
   );
diff --git a/apps/expo/features/catalog/hooks/useSimilarItems.ts b/apps/expo/features/catalog/hooks/useSimilarItems.ts
index 430fe66173..f11c6f744b 100644
--- a/apps/expo/features/catalog/hooks/useSimilarItems.ts
+++ b/apps/expo/features/catalog/hooks/useSimilarItems.ts
@@ -18,10 +18,13 @@ export interface SimilarItemsResponse {
   sourceItem: CatalogItem;
 }
 
-export const getSimilarCatalogItems = async (
-  id: string,
-  params?: SimilarItemsParams,
-): Promise<SimilarItemsResponse> => {
+export const getSimilarCatalogItems = async ({
+  id,
+  params,
+}: {
+  id: string;
+  params?: SimilarItemsParams;
+}): Promise<SimilarItemsResponse> => {
   const { data, error } = await apiClient.catalog({ id }).similar.get({
     query: {
       ...(params?.limit !== undefined ? { limit: String(params.limit) } : {}),
@@ -33,10 +36,13 @@ export const getSimilarCatalogItems = async (
   return data as unknown as SimilarItemsResponse;
 };
 
-export const getSimilarPackItems = async (
-  packId: string,
-  opts: { itemId: string; params?: SimilarItemsParams },
-) => {
+export const getSimilarPackItems = async ({
+  packId,
+  opts,
+}: {
+  packId: string;
+  opts: { itemId: string; params?: SimilarItemsParams };
+}) => {
   const { itemId, params } = opts;
   const { data, error } = await apiClient
     .packs({ packId })
@@ -51,27 +57,36 @@ export const getSimilarPackItems = async (
   return data;
 };
 
-export function useSimilarCatalogItems(id: string, params?: SimilarItemsParams) {
+export function useSimilarCatalogItems({
+  id,
+  params,
+}: {
+  id: string;
+  params?: SimilarItemsParams;
+}) {
   const { isQueryEnabledWithAccessToken } = useAuthenticatedQueryToolkit();
 
   return useQuery({
     queryKey: ['similarCatalogItems', id, params],
-    queryFn: () => getSimilarCatalogItems(id, params),
+    queryFn: () => getSimilarCatalogItems({ id, params }),
     enabled: isQueryEnabledWithAccessToken && !!id,
     staleTime: 5 * 60 * 1000,
   });
 }
 
-export function useSimilarPackItems(
-  packId: string,
-  opts: { itemId: string; params?: SimilarItemsParams },
-) {
+export function useSimilarPackItems({
+  packId,
+  opts,
+}: {
+  packId: string;
+  opts: { itemId: string; params?: SimilarItemsParams };
+}) {
   const { itemId, params } = opts;
   const { isQueryEnabledWithAccessToken } = useAuthenticatedQueryToolkit();
 
   return useQuery({
     queryKey: ['similarPackItems', packId, itemId, params],
-    queryFn: () => getSimilarPackItems(packId, { itemId, params }),
+    queryFn: () => getSimilarPackItems({ packId, opts: { itemId, params } }),
     enabled: isQueryEnabledWithAccessToken && !!packId && !!itemId,
     staleTime: 5 * 60 * 1000,
   });
diff --git a/apps/expo/features/catalog/hooks/useVectorSearch.ts b/apps/expo/features/catalog/hooks/useVectorSearch.ts
index ac0d8a83cb..b68551806b 100644
--- a/apps/expo/features/catalog/hooks/useVectorSearch.ts
+++ b/apps/expo/features/catalog/hooks/useVectorSearch.ts
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
-const vectorSearchApi = async (query: string, limit?: number) => {
+const vectorSearchApi = async ({ query, limit }: { query: string; limit?: number }) => {
   const { data, error } = await apiClient.catalog['vector-search'].get({
     query: {
       q: query,
@@ -23,6 +23,6 @@ export const useVectorSearch = ({ query, limit }: { query: string; limit?: numbe
   return useQuery({
     queryKey: ['vectorSearch', query],
     enabled: isQueryEnabledWithAccessToken && !!query && query.length > 0,
-    queryFn: () => vectorSearchApi(query, limit),
+    queryFn: () => vectorSearchApi({ query, limit }),
   });
 };
diff --git a/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts b/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
index e33322022c..77143a2aba 100644
--- a/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
+++ b/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
@@ -8,9 +8,9 @@ export async function cacheCatalogItemImage(imageUrl?: string): Promise<string |
   }
 
   try {
-    const extension = await getImageExtension(imageUrl);
+    const extension = await getImageExtension({ url: imageUrl });
     const filename = `${nanoid()}.${extension}`;
-    await ImageCacheManager.cacheRemoteImage(filename, imageUrl);
+    await ImageCacheManager.cacheRemoteImage({ fileName: filename, remoteUrl: imageUrl });
     return filename;
   } catch (err) {
     console.log('caching remote image failed', err);
diff --git a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx b/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
index 2ec39d8f97..f99c76c66c 100644
--- a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
+++ b/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
@@ -287,4 +287,4 @@ function CatalogItemsScreen() {
   );
 }
 
-export default withAuthWall(CatalogItemsScreen, CatalogItemsAuthWall);
+export default withAuthWall({ Component: CatalogItemsScreen, AuthWall: CatalogItemsAuthWall });
diff --git a/apps/expo/features/feed/components/CommentItem.tsx b/apps/expo/features/feed/components/CommentItem.tsx
index b3f29b8629..be7c7f282a 100644
--- a/apps/expo/features/feed/components/CommentItem.tsx
+++ b/apps/expo/features/feed/components/CommentItem.tsx
@@ -30,7 +30,7 @@ export const CommentItem: React.FC<CommentItemProps> = ({
         <View className="flex-row items-center gap-2 flex-wrap">
           <Text className="font-semibold text-sm">{formatAuthorName(comment)}</Text>
           <Text className="text-xs text-muted-foreground">
-            {formatRelativeDate(comment.createdAt)}
+            {formatRelativeDate({ dateValue: comment.createdAt })}
           </Text>
         </View>
         <Text className="text-sm mt-0.5">{comment.content}</Text>
diff --git a/apps/expo/features/feed/components/PostCard.tsx b/apps/expo/features/feed/components/PostCard.tsx
index 52388de2ee..d732337f08 100644
--- a/apps/expo/features/feed/components/PostCard.tsx
+++ b/apps/expo/features/feed/components/PostCard.tsx
@@ -49,7 +49,7 @@ export const PostCard: React.FC<PostCardProps> = ({ post, onLike, onDelete, curr
           <View>
             <Text className="font-semibold text-sm">{formatAuthorName(post)}</Text>
             <Text className="text-xs text-muted-foreground">
-              {formatRelativeDate(post.createdAt)}
+              {formatRelativeDate({ dateValue: post.createdAt })}
             </Text>
           </View>
         </View>
diff --git a/apps/expo/features/feed/screens/CreatePostScreen.tsx b/apps/expo/features/feed/screens/CreatePostScreen.tsx
index 68fa39c5e1..4af5c4a6fb 100644
--- a/apps/expo/features/feed/screens/CreatePostScreen.tsx
+++ b/apps/expo/features/feed/screens/CreatePostScreen.tsx
@@ -97,7 +97,7 @@ export const CreatePostScreen = ({ onSuccess }: { onSuccess?: () => void }) => {
             ? (photo.fileName.split('.').pop()?.toLowerCase() ?? 'jpg')
             : 'jpg';
           const uniqueName = `${nanoid()}.${ext}`;
-          return uploadImage(uniqueName, photo.uri);
+          return uploadImage({ fileName: uniqueName, uri: photo.uri });
         }),
       );
 
diff --git a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
index 2ad9cd6e15..eaadc862dc 100644
--- a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
+++ b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
@@ -11,7 +11,8 @@ vi.mock('@packrat/env/expo-client', () => ({
 // Also mock getRelativeTime so that formatRelativeDate has a predictable
 // alias target that does not depend on the current clock.
 vi.mock('expo-app/lib/utils/getRelativeTime', () => ({
-  getRelativeTime: (input: string | Date) => `relative(${String(input)})`,
+  getRelativeTime: ({ dateValue }: { dateValue: string | Date }) =>
+    `relative(${String(dateValue)})`,
 }));
 
 import type { Comment, Post } from '../../types';
@@ -116,7 +117,7 @@ describe('feed/utils', () => {
   // ---------------------------------------------------------------------------
   describe('formatRelativeDate', () => {
     it('delegates to getRelativeTime', () => {
-      expect(formatRelativeDate('2024-01-01T00:00:00.000Z')).toBe(
+      expect(formatRelativeDate({ dateValue: '2024-01-01T00:00:00.000Z' })).toBe(
         'relative(2024-01-01T00:00:00.000Z)',
       );
     });
diff --git a/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts b/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts
index c2134dca2d..a96a9dac46 100644
--- a/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts
+++ b/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts
@@ -10,7 +10,7 @@ describe('OfflineAI - MockLLMProvider', () => {
 
   describe('generate()', () => {
     it('should return a basic response for simple prompts', async () => {
-      const response = await provider.generate('Hello');
+      const response = await provider.generate({ _prompt: 'Hello' });
       expect(response).toBeDefined();
       expect(typeof response).toBe('string');
       expect(response.length).toBeGreaterThan(0);
@@ -26,7 +26,10 @@ describe('OfflineAI - MockLLMProvider', () => {
         activity: 'hiking',
       };
 
-      const response = await provider.generate('What gear do I need for this trail?', { context });
+      const response = await provider.generate({
+        _prompt: 'What gear do I need for this trail?',
+        options: { context },
+      });
 
       expect(response).toContain('Test Trail');
     });
@@ -44,7 +47,10 @@ describe('OfflineAI - MockLLMProvider', () => {
         activity: 'backpacking',
       };
 
-      const response = await provider.generate('What should I pack?', { context });
+      const response = await provider.generate({
+        _prompt: 'What should I pack?',
+        options: { context },
+      });
 
       expect(response).toBeDefined();
       // Should mention weather-relevant items
@@ -52,7 +58,10 @@ describe('OfflineAI - MockLLMProvider', () => {
     });
 
     it('should handle empty context gracefully', async () => {
-      const response = await provider.generate('Hello', { context: undefined });
+      const response = await provider.generate({
+        _prompt: 'Hello',
+        options: { context: undefined },
+      });
       expect(response).toBeDefined();
       expect(typeof response).toBe('string');
     });
@@ -60,8 +69,11 @@ describe('OfflineAI - MockLLMProvider', () => {
     it('should accept system prompt without error (not applied in mock)', async () => {
       // systemPrompt is part of the GenerateOptions interface for real providers;
       // the MockLLMProvider accepts it but does not use it in response generation.
-      const response = await provider.generate('Hello', {
-        systemPrompt: 'You are a helpful hiking assistant.',
+      const response = await provider.generate({
+        _prompt: 'Hello',
+        options: {
+          systemPrompt: 'You are a helpful hiking assistant.',
+        },
       });
 
       expect(response).toBeDefined();
@@ -75,7 +87,10 @@ describe('OfflineAI - MockLLMProvider', () => {
         },
       };
 
-      const response = await provider.generate('What do I need?', { context });
+      const response = await provider.generate({
+        _prompt: 'What do I need?',
+        options: { context },
+      });
 
       expect(response).toContain('Lakeside Camp');
     });
@@ -89,7 +104,7 @@ describe('OfflineAI - MockLLMProvider', () => {
         },
       };
 
-      const response = await provider.generate('Compare trails', { context });
+      const response = await provider.generate({ _prompt: 'Compare trails', options: { context } });
 
       expect(response).toContain('Test Trail');
     });
@@ -104,7 +119,7 @@ describe('OfflineAI - MockLLMProvider', () => {
         // weather is optional
       };
 
-      const response = await provider.generate('Hello', { context });
+      const response = await provider.generate({ _prompt: 'Hello', options: { context } });
 
       expect(response).toContain('Simple Trail');
     });
diff --git a/apps/expo/features/offline-ai/lib/MockLLMProvider.ts b/apps/expo/features/offline-ai/lib/MockLLMProvider.ts
index 11b26b361d..bb9334f9f4 100644
--- a/apps/expo/features/offline-ai/lib/MockLLMProvider.ts
+++ b/apps/expo/features/offline-ai/lib/MockLLMProvider.ts
@@ -25,7 +25,13 @@ export interface GenerateOptions {
 }
 
 export class MockLLMProvider {
-  async generate(_prompt: string, options?: GenerateOptions): Promise<string> {
+  async generate({
+    _prompt,
+    options,
+  }: {
+    _prompt: string;
+    options?: GenerateOptions;
+  }): Promise<string> {
     const context = options?.context;
 
     // If no context provided, return default greeting
diff --git a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
index 6700665c15..2750844418 100644
--- a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
+++ b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
@@ -120,7 +120,7 @@ export default React.forwardRef<BottomSheetModal, AddPackTemplateItemActionsProp
 
     const handleCatalogItemsSelected = async (catalogItems: CatalogItem[]) => {
       trackRecentlyUsed(catalogItems);
-      await addItemsToPackTemplate(packTemplateId, catalogItems);
+      await addItemsToPackTemplate({ packTemplateId, catalogItems });
       const itemWord =
         catalogItems.length === 1 ? t('packTemplates.item') : t('packTemplates.items');
       Burnt.toast({
diff --git a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
index 81355a0ef1..62186ebd5f 100644
--- a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
+++ b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
@@ -104,7 +104,7 @@ export function FeaturedPacksSection({ onTemplatePress }: FeaturedPacksSectionPr
   // Single pass over the items store computes item count + base weight for all
   // featured templates at once, instead of each card subscribing to the full
   // details hook and iterating every item in the store on its own.
-  const summaries = usePackTemplateSummaries(featuredIds);
+  const summaries = usePackTemplateSummaries({ templateIds: featuredIds });
 
   if (featuredTemplates.length === 0) return null;
 
diff --git a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
index 68b0c57afe..899146e589 100644
--- a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
+++ b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
@@ -9,10 +9,13 @@ export function useBulkAddCatalogItems() {
   const [isLoading, setIsLoading] = useState(false);
   const createItem = useCreatePackTemplateItem();
 
-  const addItemsToPackTemplate = async (
-    packTemplateId: string,
-    catalogItems: CatalogItemWithPackItemFields[],
-  ) => {
+  const addItemsToPackTemplate = async ({
+    packTemplateId,
+    catalogItems,
+  }: {
+    packTemplateId: string;
+    catalogItems: CatalogItemWithPackItemFields[];
+  }) => {
     if (catalogItems.length === 0) return;
 
     setIsLoading(true);
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
index ea9fbc9155..041e71298d 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
@@ -17,7 +17,7 @@ export function useCreatePackTemplate() {
       deleted: false,
     };
 
-    obs(packTemplatesStore, id).set(newTemplate);
+    obs({ store: packTemplatesStore, id: id }).set(newTemplate);
   }, []);
 
   return createPackTemplate;
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
index 8e4dd5e963..00d9ea9ea4 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
@@ -19,8 +19,10 @@ export function useCreatePackTemplateItem() {
         deleted: false,
       };
 
-      obs(packTemplateItemsStore, id).set(newItem);
-      obs(packTemplatesStore, packTemplateId).localUpdatedAt.set(new Date().toISOString());
+      obs({ store: packTemplateItemsStore, id: id }).set(newItem);
+      obs({ store: packTemplatesStore, id: packTemplateId }).localUpdatedAt.set(
+        new Date().toISOString(),
+      );
     },
     [],
   );
diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts
index 10c9f1f2ba..f5edb59287 100644
--- a/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts
@@ -4,7 +4,7 @@ import { packTemplatesStore } from '../store/packTemplates';
 
 export function useDeletePackTemplate() {
   const del = useCallback((id: string) => {
-    obs(packTemplatesStore, id).deleted.set(true);
+    obs({ store: packTemplatesStore, id: id }).deleted.set(true);
   }, []);
 
   return del;
diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts
index 8c8d4c0b2c..8a0674124e 100644
--- a/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts
@@ -5,7 +5,7 @@ import { packTemplateItemsStore } from '../store/packTemplateItems';
 export function useDeletePackTemplateItem() {
   const deletePackTemplateItem = useCallback((id: string) => {
     // Soft delete by setting deleted flag
-    obs(packTemplateItemsStore, id).deleted.set(true);
+    obs({ store: packTemplateItemsStore, id: id }).deleted.set(true);
 
     return Promise.resolve({ id });
   }, []);
diff --git a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
index 4276262235..6190e861ab 100644
--- a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
+++ b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
@@ -79,7 +79,7 @@ export function useGenerateTemplateFromOnlineContent() {
     },
     onSuccess: (data) => {
       const { items, ...template } = data;
-      obs(packTemplatesStore, template.id).set(template);
+      obs({ store: packTemplatesStore, id: template.id }).set(template);
       for (const item of items) {
         if (!isWeightUnit(item.weightUnit)) {
           throw new Error(`Unsupported weightUnit "${item.weightUnit}" for item ${item.id}`);
@@ -103,7 +103,7 @@ export function useGenerateTemplateFromOnlineContent() {
           createdAt: item.createdAt,
           updatedAt: item.updatedAt,
         };
-        obs(packTemplateItemsStore, item.id).set(storeItem);
+        obs({ store: packTemplateItemsStore, id: item.id }).set(storeItem);
       }
     },
   });
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
index 56a92edf6a..3ac9b7f52f 100644
--- a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
+++ b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
@@ -17,10 +17,13 @@ export type PackTemplateSummary = {
  * allocations that `usePackTemplateDetails` incurs (which spreads the
  * template and its items on every change).
  */
-export function usePackTemplateSummary(
-  templateId: string,
-  preferredUnit: WeightUnit = 'g',
-): PackTemplateSummary {
+export function usePackTemplateSummary({
+  templateId,
+  preferredUnit = 'g',
+}: {
+  templateId: string;
+  preferredUnit?: WeightUnit;
+}): PackTemplateSummary {
   return use$(() => {
     let itemCount = 0;
     let baseWeightGrams = 0;
@@ -30,7 +33,8 @@ export function usePackTemplateSummary(
     for (const item of Object.values(items)) {
       if (item.packTemplateId !== templateId || item.deleted) continue;
       itemCount++;
-      const itemWeightInGrams = convertToGrams(item.weight, item.weightUnit) * item.quantity;
+      const itemWeightInGrams =
+        convertToGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity;
       totalWeightGrams += itemWeightInGrams;
       if (!item.consumable && !item.worn) {
         baseWeightGrams += itemWeightInGrams;
@@ -39,8 +43,12 @@ export function usePackTemplateSummary(
 
     return {
       itemCount,
-      baseWeight: Number(convertFromGrams(baseWeightGrams, preferredUnit).toFixed(2)),
-      totalWeight: Number(convertFromGrams(totalWeightGrams, preferredUnit).toFixed(2)),
+      baseWeight: Number(
+        convertFromGrams({ grams: baseWeightGrams, unit: preferredUnit }).toFixed(2),
+      ),
+      totalWeight: Number(
+        convertFromGrams({ grams: totalWeightGrams, unit: preferredUnit }).toFixed(2),
+      ),
     };
   });
 }
@@ -52,10 +60,13 @@ export function usePackTemplateSummary(
  * renderers) — it avoids a `store.get()` per id and scales linearly with the
  * total number of items rather than multiplicatively.
  */
-export function usePackTemplateSummaries(
-  templateIds: string[],
-  preferredUnit: WeightUnit = 'g',
-): Record<string, PackTemplateSummary> {
+export function usePackTemplateSummaries({
+  templateIds,
+  preferredUnit = 'g',
+}: {
+  templateIds: string[];
+  preferredUnit?: WeightUnit;
+}): Record<string, PackTemplateSummary> {
   return use$(() => {
     if (templateIds.length === 0) return {};
 
@@ -72,7 +83,8 @@ export function usePackTemplateSummaries(
       const bucket = grams[item.packTemplateId];
       if (!bucket) continue;
       bucket.count++;
-      const itemWeightInGrams = convertToGrams(item.weight, item.weightUnit) * item.quantity;
+      const itemWeightInGrams =
+        convertToGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity;
       bucket.total += itemWeightInGrams;
       if (!item.consumable && !item.worn) {
         bucket.base += itemWeightInGrams;
@@ -84,8 +96,12 @@ export function usePackTemplateSummaries(
       const bucket = grams[id] ?? { base: 0, total: 0, count: 0 };
       result[id] = {
         itemCount: bucket.count,
-        baseWeight: Number(convertFromGrams(bucket.base, preferredUnit).toFixed(2)),
-        totalWeight: Number(convertFromGrams(bucket.total, preferredUnit).toFixed(2)),
+        baseWeight: Number(
+          convertFromGrams({ grams: bucket.base, unit: preferredUnit }).toFixed(2),
+        ),
+        totalWeight: Number(
+          convertFromGrams({ grams: bucket.total, unit: preferredUnit }).toFixed(2),
+        ),
       };
     }
     return result;
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
index df62273388..baf4fa61e1 100644
--- a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
+++ b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
@@ -7,7 +7,7 @@ import { computePackTemplateWeights } from '../utils/computePacktemplateWeight';
 // Hook to get a single pack template
 export function usePackTemplateDetails(id: string) {
   const template = use$(() => {
-    const template = obs(packTemplatesStore, id).get();
+    const template = obs({ store: packTemplatesStore, id: id }).get();
     const items = getTemplateItems(id);
     return {
       ...template,
@@ -15,5 +15,5 @@ export function usePackTemplateDetails(id: string) {
     };
   });
 
-  return computePackTemplateWeights(template);
+  return computePackTemplateWeights({ template });
 }
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
index 993ad63919..8ee680fe9f 100644
--- a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
@@ -7,8 +7,10 @@ import type { PackTemplateItem } from '../types';
 
 export function useUpdatePackTemplateItem() {
   const updatePackTemplateItem = useCallback((item: PackTemplateItem) => {
-    obs(packTemplateItemsStore, item.id).set(item);
-    obs(packTemplatesStore, item.packTemplateId).localUpdatedAt.set(new Date().toISOString());
+    obs({ store: packTemplateItemsStore, id: item.id }).set(item);
+    obs({ store: packTemplatesStore, id: item.packTemplateId }).localUpdatedAt.set(
+      new Date().toISOString(),
+    );
   }, []);
 
   return updatePackTemplateItem;
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
index 7ac5376c59..99ed26d996 100644
--- a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
@@ -5,7 +5,7 @@ import type { PackTemplate } from '../types';
 
 export function useUpdatePackTemplate() {
   const update = useCallback((template: PackTemplate) => {
-    obs(packTemplatesStore, template.id).set({
+    obs({ store: packTemplatesStore, id: template.id }).set({
       ...template,
       localUpdatedAt: new Date().toISOString(),
     });
diff --git a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts b/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts
index 1e265ed56c..11ad2097f3 100644
--- a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts
+++ b/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts
@@ -3,7 +3,7 @@ import { obs } from 'expo-app/lib/store';
 import { packTemplatesStore } from '../store';
 
 export function useWritePermissionCheck(id: string) {
-  const packTemplate = obs(packTemplatesStore, id).get();
+  const packTemplate = obs({ store: packTemplatesStore, id: id }).get();
   const user = useUser();
 
   return packTemplate.isAppTemplate ? user?.role === 'ADMIN' : true;
diff --git a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
index 8a9db11b7c..41cbb60127 100644
--- a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
+++ b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
@@ -294,7 +294,7 @@ export const CreatePackTemplateItemForm = ({
                   <Text className="text-foreground/70 mb-2 text-sm">Unit</Text>
                   <SegmentedControl
                     values={WEIGHT_UNITS}
-                    selectedIndex={safeIndexOf(WEIGHT_UNITS, field.state.value)}
+                    selectedIndex={safeIndexOf({ array: WEIGHT_UNITS, value: field.state.value })}
                     onIndexChange={(index) => {
                       const selectedUnit = WEIGHT_UNITS[index];
                       if (selectedUnit) {
diff --git a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
index 2ea880be38..f3b31dd394 100644
--- a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
+++ b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
@@ -158,7 +158,10 @@ export function ItemsScanScreen() {
   const handleCatalogItemsSelected = async () => {
     router.back();
     try {
-      await addItemsToPackTemplate(packTemplateId as string, selectedCatalogItemsList);
+      await addItemsToPackTemplate({
+        packTemplateId: packTemplateId as string,
+        catalogItems: selectedCatalogItemsList,
+      });
       const itemWord =
         selectedCatalogItemsList.length === 1 ? t('packTemplates.item') : t('packTemplates.items');
       Burnt.toast({
diff --git a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
index c9f4f72480..543433136f 100644
--- a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
+++ b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
@@ -53,13 +53,16 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   describe('with no items', () => {
     it('returns 0 for base and total weight (default unit: grams)', () => {
-      const result = computePackTemplateWeights(makeTemplate([]));
+      const result = computePackTemplateWeights({ template: makeTemplate([]) });
       expect(result.baseWeight).toBe(0);
       expect(result.totalWeight).toBe(0);
     });
 
     it('returns 0 regardless of preferred unit', () => {
-      const result = computePackTemplateWeights(makeTemplate([]), 'kg');
+      const result = computePackTemplateWeights({
+        template: makeTemplate([]),
+        preferredUnit: 'kg',
+      });
       expect(result.baseWeight).toBe(0);
       expect(result.totalWeight).toBe(0);
     });
@@ -70,22 +73,22 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   describe('with base gear only', () => {
     it('sums weights into base and total in grams by default', () => {
-      const result = computePackTemplateWeights(
-        makeTemplate([
+      const result = computePackTemplateWeights({
+        template: makeTemplate([
           makeItem({ id: 'a', weight: 500, weightUnit: 'g', quantity: 1 }),
           makeItem({ id: 'b', weight: 1, weightUnit: 'kg', quantity: 2 }),
         ]),
-      );
+      });
       // 500g + 2 * 1000g = 2500g
       expect(result.baseWeight).toBe(2500);
       expect(result.totalWeight).toBe(2500);
     });
 
     it('converts to the preferred unit (kg)', () => {
-      const result = computePackTemplateWeights(
-        makeTemplate([makeItem({ weight: 2500, weightUnit: 'g', quantity: 1 })]),
-        'kg',
-      );
+      const result = computePackTemplateWeights({
+        template: makeTemplate([makeItem({ weight: 2500, weightUnit: 'g', quantity: 1 })]),
+        preferredUnit: 'kg',
+      });
       // 2500g => 2.5kg, rounded to 2 decimals
       expect(result.baseWeight).toBe(2.5);
       expect(result.totalWeight).toBe(2.5);
@@ -97,12 +100,12 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   describe('with consumable items', () => {
     it('excludes consumables from base but includes them in total', () => {
-      const result = computePackTemplateWeights(
-        makeTemplate([
+      const result = computePackTemplateWeights({
+        template: makeTemplate([
           makeItem({ id: 'a', weight: 1000, weightUnit: 'g', consumable: false }),
           makeItem({ id: 'b', weight: 500, weightUnit: 'g', consumable: true }),
         ]),
-      );
+      });
       expect(result.baseWeight).toBe(1000);
       expect(result.totalWeight).toBe(1500);
     });
@@ -113,12 +116,12 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   describe('with worn items', () => {
     it('excludes worn items from base but includes them in total', () => {
-      const result = computePackTemplateWeights(
-        makeTemplate([
+      const result = computePackTemplateWeights({
+        template: makeTemplate([
           makeItem({ id: 'a', weight: 800, weightUnit: 'g', worn: false }),
           makeItem({ id: 'b', weight: 200, weightUnit: 'g', worn: true }),
         ]),
-      );
+      });
       expect(result.baseWeight).toBe(800);
       expect(result.totalWeight).toBe(1000);
     });
@@ -129,9 +132,9 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   describe('quantity handling', () => {
     it('multiplies item weight by quantity', () => {
-      const result = computePackTemplateWeights(
-        makeTemplate([makeItem({ weight: 250, weightUnit: 'g', quantity: 4 })]),
-      );
+      const result = computePackTemplateWeights({
+        template: makeTemplate([makeItem({ weight: 250, weightUnit: 'g', quantity: 4 })]),
+      });
       expect(result.totalWeight).toBe(1000);
       expect(result.baseWeight).toBe(1000);
     });
@@ -142,7 +145,7 @@ describe('computePackTemplateWeights', () => {
   // ---------------------------------------------------------------------------
   it('returns the same template metadata alongside computed weights', () => {
     const template = makeTemplate([makeItem({ weight: 100, weightUnit: 'g', quantity: 1 })]);
-    const result = computePackTemplateWeights(template);
+    const result = computePackTemplateWeights({ template: template });
     expect(result.id).toBe(template.id);
     expect(result.name).toBe(template.name);
     expect(result.items).toHaveLength(1);
diff --git a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
index d4a767465d..cf99ad4670 100644
--- a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
+++ b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
@@ -2,16 +2,20 @@ import type { WeightUnit } from '@packrat/units';
 import { displayWeight, normalize, parseWeightUnit } from '@packrat/units';
 import type { PackTemplate } from '../types';
 
-export const computePackTemplateWeights = (
-  template: Omit<PackTemplate, 'baseWeight' | 'totalWeight'>,
-  preferredUnit: WeightUnit = 'g',
-): PackTemplate => {
+export const computePackTemplateWeights = ({
+  template,
+  preferredUnit = 'g',
+}: {
+  template: Omit<PackTemplate, 'baseWeight' | 'totalWeight'>;
+  preferredUnit?: WeightUnit;
+}): PackTemplate => {
   let baseWeightGrams = 0;
   let totalWeightGrams = 0;
 
   for (const item of template.items) {
     const itemWeightInGrams =
-      normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
     totalWeightGrams += itemWeightInGrams;
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
@@ -20,7 +24,7 @@ export const computePackTemplateWeights = (
 
   return {
     ...template,
-    baseWeight: displayWeight(baseWeightGrams, preferredUnit),
-    totalWeight: displayWeight(totalWeightGrams, preferredUnit),
+    baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }),
+    totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }),
   };
 };
diff --git a/apps/expo/features/packs/components/AddPackItemActions.tsx b/apps/expo/features/packs/components/AddPackItemActions.tsx
index 67d646cf75..8a05734bc2 100644
--- a/apps/expo/features/packs/components/AddPackItemActions.tsx
+++ b/apps/expo/features/packs/components/AddPackItemActions.tsx
@@ -109,7 +109,7 @@ export default React.forwardRef<BottomSheetModal, AddPackItemActionsProps>(
       if (catalogItems.length > 0) {
         trackRecentlyUsed(catalogItems);
         try {
-          await addItemsToPack(packId, catalogItems);
+          await addItemsToPack({ packId, catalogItems });
         } catch (error) {
           console.error('Error adding catalog items to pack:', error);
           Alert.alert(t('common.error'), t('catalog.somethingWentWrong'));
diff --git a/apps/expo/features/packs/components/CachedImage.tsx b/apps/expo/features/packs/components/CachedImage.tsx
index 5d12cf739a..29d7b6c4cb 100644
--- a/apps/expo/features/packs/components/CachedImage.tsx
+++ b/apps/expo/features/packs/components/CachedImage.tsx
@@ -35,7 +35,10 @@ export const CachedImage: React.FC<CachedImageProps> = ({
         if (localUri) {
           setImageLocalUri(localUri);
         } else {
-          const localUri = await ImageCacheManager.cacheRemoteImage(imageObjectKey, imageRemoteUrl);
+          const localUri = await ImageCacheManager.cacheRemoteImage({
+            fileName: imageObjectKey,
+            remoteUrl: imageRemoteUrl,
+          });
           setImageLocalUri(localUri);
         }
       } catch (error) {
diff --git a/apps/expo/features/packs/components/GapSuggestion.tsx b/apps/expo/features/packs/components/GapSuggestion.tsx
index 21dd623988..4e8ea30561 100644
--- a/apps/expo/features/packs/components/GapSuggestion.tsx
+++ b/apps/expo/features/packs/components/GapSuggestion.tsx
@@ -27,11 +27,14 @@ export function GapSuggestion({ gap, packId }: GapSuggestionProps) {
   });
 
   const handleAddItem = async (item: CatalogItem) => {
-    await addItemToPack(packId, {
-      catalogItem: item,
-      data: {
-        consumable: gap.consumable,
-        worn: gap.worn,
+    await addItemToPack({
+      packId,
+      opts: {
+        catalogItem: item,
+        data: {
+          consumable: gap.consumable,
+          worn: gap.worn,
+        },
       },
     });
     setCatalogSuggestionsModalVisible(false);
diff --git a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
index d540b5cf29..ba6f3f57ed 100644
--- a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
+++ b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
@@ -17,12 +17,12 @@ type HorizontalCatalogItemCardProps = {
     }
 );
 
-const formatPrice = (price?: number | null, currency?: string | null) => {
+const formatPrice = ({ price, currency }: { price?: number | null; currency?: string | null }) => {
   if (!price) return '';
   return `${currency || '$'}${price.toFixed(2)}`;
 };
 
-const formatWeight = (weight?: number | null, unit?: string | null) => {
+const formatWeight = ({ weight, unit }: { weight?: number | null; unit?: string | null }) => {
   if (!weight) return '';
   return `${weight}${unit || 'g'}`;
 };
@@ -62,13 +62,13 @@ export function HorizontalCatalogItemCard({ item, ...restProps }: HorizontalCata
             <Text>
               {item.price && (
                 <Text className="text-sm font-medium text-foreground">
-                  {formatPrice(item.price, item.currency)}
+                  {formatPrice({ price: item.price, currency: item.currency })}
                 </Text>
               )}
             </Text>
             {item.weight && (
               <Text className="text-sm text-muted-foreground">
-                {formatWeight(item.weight, item.weightUnit)}
+                {formatWeight({ weight: item.weight, unit: item.weightUnit })}
               </Text>
             )}
             {item.ratingValue && (
diff --git a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx b/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx
index 0d4d25aa93..afb39e3822 100644
--- a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx
+++ b/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx
@@ -81,9 +81,9 @@ export const SimilarItemsForPackItem: React.FC<SimilarItemsForPackItemProps> = (
 }) => {
   const { t } = useTranslation();
   const router = useRouter();
-  const { data, isLoading, isError } = useSimilarPackItems(packId, {
-    itemId,
-    params: { limit, threshold },
+  const { data, isLoading, isError } = useSimilarPackItems({
+    packId,
+    opts: { itemId, params: { limit, threshold } },
   });
 
   const handleItemPress = (catalogItemId: string) => {
diff --git a/apps/expo/features/packs/components/TemplateItemsSection.tsx b/apps/expo/features/packs/components/TemplateItemsSection.tsx
index e4086b0903..115ed62c35 100644
--- a/apps/expo/features/packs/components/TemplateItemsSection.tsx
+++ b/apps/expo/features/packs/components/TemplateItemsSection.tsx
@@ -32,7 +32,7 @@ interface TemplateItemsSectionProps {
 }
 
 // Helper function to format weight
-const formatWeight = (weight: number, unit: string) => {
+const formatWeight = ({ weight, unit }: { weight: number; unit: string }) => {
   if (weight < 1 && unit === 'kg') {
     return `${(weight * 1000).toFixed(0)}g`;
   }
@@ -78,7 +78,7 @@ const TemplateItemCard = ({ item }: { item: PackTemplateItem }) => {
         <View className="flex-row items-center">
           <Icon name="dumbbell" size={12} color={colors.grey2} />
           <Text className="ml-1 text-xs font-medium text-foreground">
-            {formatWeight(item.weight, item.weightUnit)}
+            {formatWeight({ weight: item.weight, unit: item.weightUnit })}
           </Text>
         </View>
         <View className="flex-row items-center">
@@ -122,7 +122,8 @@ export const TemplateItemsSection = ({ templateItems }: TemplateItemsSectionProp
       <View className="mb-4">
         <Text className="text-lg font-bold text-foreground">Items</Text>
         <Text className="text-sm text-muted-foreground">
-          {templateStats.totalItems} items • {formatWeight(templateStats.totalWeight, 'kg')} •{' '}
+          {templateStats.totalItems} items •{' '}
+          {formatWeight({ weight: templateStats.totalWeight, unit: 'kg' })} •{' '}
           {templateStats.categories.size} categories
         </Text>
       </View>
diff --git a/apps/expo/features/packs/hooks/useAddCatalogItem.ts b/apps/expo/features/packs/hooks/useAddCatalogItem.ts
index 63a509d77b..d2e53698da 100644
--- a/apps/expo/features/packs/hooks/useAddCatalogItem.ts
+++ b/apps/expo/features/packs/hooks/useAddCatalogItem.ts
@@ -11,10 +11,13 @@ export function useAddCatalogItem() {
   const [isLoading, setIsLoading] = useState(false);
   const createItem = useCreatePackItem();
 
-  const addItemToPack = async (
-    packId: string,
-    opts: { catalogItem: CatalogItem; data?: Partial<PackItem> },
-  ) => {
+  const addItemToPack = async ({
+    packId,
+    opts,
+  }: {
+    packId: string;
+    opts: { catalogItem: CatalogItem; data?: Partial<PackItem> };
+  }) => {
     const { catalogItem, data } = opts;
     setIsLoading(true);
     const cachedImageFilename = await cacheCatalogItemImage(catalogItem.images?.[0]);
diff --git a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
index 463b4a4b42..ec97a0e682 100644
--- a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
+++ b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
@@ -9,7 +9,13 @@ export function useBulkAddCatalogItems() {
   const [isLoading, setIsLoading] = useState(false);
   const createItem = useCreatePackItem();
 
-  const addItemsToPack = async (packId: string, catalogItems: CatalogItemWithPackItemFields[]) => {
+  const addItemsToPack = async ({
+    packId,
+    catalogItems,
+  }: {
+    packId: string;
+    catalogItems: CatalogItemWithPackItemFields[];
+  }) => {
     if (catalogItems.length === 0) return;
 
     setIsLoading(true);
diff --git a/apps/expo/features/packs/hooks/useCreatePack.ts b/apps/expo/features/packs/hooks/useCreatePack.ts
index 38c4a7d918..79f0258917 100644
--- a/apps/expo/features/packs/hooks/useCreatePack.ts
+++ b/apps/expo/features/packs/hooks/useCreatePack.ts
@@ -18,7 +18,7 @@ export function useCreatePack() {
       deleted: false,
     };
 
-    obs(packsStore, id).set(newPack);
+    obs({ store: packsStore, id: id }).set(newPack);
 
     return id;
   }, []);
diff --git a/apps/expo/features/packs/hooks/useCreatePackItem.ts b/apps/expo/features/packs/hooks/useCreatePackItem.ts
index 164c2af32d..2fdac28712 100644
--- a/apps/expo/features/packs/hooks/useCreatePackItem.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackItem.ts
@@ -28,8 +28,8 @@ export function useCreatePackItem() {
         deleted: false,
       };
 
-      obs(packItemsStore, id).set(newItem);
-      obs(packsStore, packId).localUpdatedAt.set(new Date().toISOString());
+      obs({ store: packItemsStore, id: id }).set(newItem);
+      obs({ store: packsStore, id: packId }).localUpdatedAt.set(new Date().toISOString());
       recordPackWeight(packId);
     },
     [],
diff --git a/apps/expo/features/packs/hooks/useDeletePack.ts b/apps/expo/features/packs/hooks/useDeletePack.ts
index 9c69d93d26..19b7a6a1ed 100644
--- a/apps/expo/features/packs/hooks/useDeletePack.ts
+++ b/apps/expo/features/packs/hooks/useDeletePack.ts
@@ -6,9 +6,9 @@ export function useDeletePack() {
   const deletePack = useCallback((id: string) => {
     // Soft delete by setting deleted flag
     for (const item of getPackItems(id)) {
-      obs(packItemsStore, item.id).deleted.set(true);
+      obs({ store: packItemsStore, id: item.id }).deleted.set(true);
     }
-    obs(packsStore, id).deleted.set(true);
+    obs({ store: packsStore, id: id }).deleted.set(true);
   }, []);
 
   return deletePack;
diff --git a/apps/expo/features/packs/hooks/useDeletePackItem.ts b/apps/expo/features/packs/hooks/useDeletePackItem.ts
index 9e8a35c557..0b7b225d3b 100644
--- a/apps/expo/features/packs/hooks/useDeletePackItem.ts
+++ b/apps/expo/features/packs/hooks/useDeletePackItem.ts
@@ -5,7 +5,7 @@ import { useCallback } from 'react';
 export function useDeletePackItem() {
   const deletePackItem = useCallback((id: string) => {
     // Soft delete by setting deleted flag
-    obs(packItemsStore, id).deleted.set(true);
+    obs({ store: packItemsStore, id: id }).deleted.set(true);
 
     return Promise.resolve({ id });
   }, []);
diff --git a/apps/expo/features/packs/hooks/useDetailedPacks.ts b/apps/expo/features/packs/hooks/useDetailedPacks.ts
index f8ad24344d..cdffed4cac 100644
--- a/apps/expo/features/packs/hooks/useDetailedPacks.ts
+++ b/apps/expo/features/packs/hooks/useDetailedPacks.ts
@@ -11,7 +11,7 @@ export function useDetailedPacks(): Pack[] {
     for (const pack of packsArray) {
       if (pack.deleted) continue;
       const items = getPackItems(pack.id);
-      const packWithWeights = computePackWeights({ ...pack, items });
+      const packWithWeights = computePackWeights({ pack: { ...pack, items } });
       filteredPacks.push(packWithWeights);
     }
 
diff --git a/apps/expo/features/packs/hooks/useImageDetection.ts b/apps/expo/features/packs/hooks/useImageDetection.ts
index 89b0b48ec7..c833a496c2 100644
--- a/apps/expo/features/packs/hooks/useImageDetection.ts
+++ b/apps/expo/features/packs/hooks/useImageDetection.ts
@@ -29,7 +29,7 @@ export function useImageDetection() {
     { selectedImage: SelectedImage; matchLimit?: number }
   >({
     mutationFn: async ({ selectedImage, matchLimit = 3 }) => {
-      const image = await uploadImage(selectedImage.fileName, selectedImage.uri);
+      const image = await uploadImage({ fileName: selectedImage.fileName, uri: selectedImage.uri });
       if (!image) {
         throw new Error("Couldn't upload image");
       }
diff --git a/apps/expo/features/packs/hooks/useImagePicker.ts b/apps/expo/features/packs/hooks/useImagePicker.ts
index bde40fae25..464f74f987 100644
--- a/apps/expo/features/packs/hooks/useImagePicker.ts
+++ b/apps/expo/features/packs/hooks/useImagePicker.ts
@@ -96,7 +96,7 @@ export function useImagePicker(selectedImageInit?: SelectedImage) {
     const fileName = `${nanoid()}.${extension}`;
 
     try {
-      ImageCacheManager.cacheLocalTempImage(imageUri, fileName);
+      ImageCacheManager.cacheLocalTempImage({ tempImageUri: imageUri, fileName });
       return fileName;
     } catch (err) {
       console.error('Error saving image locally:', err);
diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
index 9bdb7bc106..801f2927c6 100644
--- a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
+++ b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
@@ -14,9 +14,9 @@ import { computePackWeights } from '../utils/computePackWeights';
  */
 export function usePackDetailsFromStore(id: string) {
   const pack = use$(() => {
-    const pack_ = obs(packsStore, id).get();
+    const pack_ = obs({ store: packsStore, id: id }).get();
     const items = getPackItems(id);
-    const packWithWeights = computePackWeights({ ...pack_, items });
+    const packWithWeights = computePackWeights({ pack: { ...pack_, items } });
     return packWithWeights;
   });
 
diff --git a/apps/expo/features/packs/hooks/usePackGapAnalysis.ts b/apps/expo/features/packs/hooks/usePackGapAnalysis.ts
index dc1d7db5c7..c37cde3b63 100644
--- a/apps/expo/features/packs/hooks/usePackGapAnalysis.ts
+++ b/apps/expo/features/packs/hooks/usePackGapAnalysis.ts
@@ -22,10 +22,13 @@ export interface GapAnalysisResponse {
   summary?: string;
 }
 
-export const analyzePackGaps = async (
-  packId: string,
-  context?: GapAnalysisRequest,
-): Promise<GapAnalysisResponse> => {
+export const analyzePackGaps = async ({
+  packId,
+  context,
+}: {
+  packId: string;
+  context?: GapAnalysisRequest;
+}): Promise<GapAnalysisResponse> => {
   const { data, error } = await apiClient.packs({ packId })['gap-analysis'].post(context ?? {});
   if (error) throw new Error(`Failed to analyze pack gaps: ${error.value}`);
   // safe-cast: treaty response shape matches GapAnalysisResponse as validated by the API schema
@@ -35,6 +38,6 @@ export const analyzePackGaps = async (
 export function usePackGapAnalysis() {
   return useMutation({
     mutationFn: ({ packId, context }: { packId: string; context?: GapAnalysisRequest }) =>
-      analyzePackGaps(packId, context),
+      analyzePackGaps({ packId, context }),
   });
 }
diff --git a/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts b/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts
index 563e42f3ce..1459688aa8 100644
--- a/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts
+++ b/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts
@@ -2,7 +2,7 @@ import { obs } from 'expo-app/lib/store';
 import { packItemsStore } from '../store';
 
 export function usePackItemOwnershipCheck(id: string) {
-  const packItem = obs(packItemsStore, id).peek();
+  const packItem = obs({ store: packItemsStore, id: id }).peek();
 
   return !!packItem;
 }
diff --git a/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts b/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts
index 43c19f836b..fb17ba50f9 100644
--- a/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts
+++ b/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts
@@ -3,5 +3,5 @@ import { obs } from 'expo-app/lib/store';
 import { packsStore } from '../store';
 
 export function usePackOwnershipCheck(id: string) {
-  return use$(() => !!obs(packsStore, id).get());
+  return use$(() => !!obs({ store: packsStore, id }).get());
 }
diff --git a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts b/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts
index a9559d0f49..1e34c77982 100644
--- a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts
+++ b/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts
@@ -10,7 +10,7 @@ export function usePackWeightAnalysis(packId: string) {
     .reduce((sum, item) => {
       const unit = item.weightUnit || 'g';
       const weight = item.weight || 0;
-      return sum + convertToGrams(weight * item.quantity, unit);
+      return sum + convertToGrams({ weight: weight * item.quantity, unit: unit });
     }, 0);
 
   const wornWeightInGrams = pack.items
@@ -18,7 +18,7 @@ export function usePackWeightAnalysis(packId: string) {
     .reduce((sum, item) => {
       const unit = item.weightUnit || 'g';
       const weight = item.weight || 0;
-      return sum + convertToGrams(weight * item.quantity, unit);
+      return sum + convertToGrams({ weight: weight * item.quantity, unit: unit });
     }, 0);
 
   const categorySummaries = computeCategorySummaries(pack);
@@ -26,11 +26,14 @@ export function usePackWeightAnalysis(packId: string) {
   return {
     data: {
       baseWeight: pack.baseWeight,
-      consumableWeight: convertFromGrams(
-        consumableWeightInGrams,
-        userStore.preferredWeightUnit.peek() ?? 'g',
-      ),
-      wornWeight: convertFromGrams(wornWeightInGrams, userStore.preferredWeightUnit.peek() ?? 'g'),
+      consumableWeight: convertFromGrams({
+        grams: consumableWeightInGrams,
+        unit: userStore.preferredWeightUnit.peek() ?? 'g',
+      }),
+      wornWeight: convertFromGrams({
+        grams: wornWeightInGrams,
+        unit: userStore.preferredWeightUnit.peek() ?? 'g',
+      }),
       totalWeight: pack.totalWeight,
       categories: categorySummaries,
     },
diff --git a/apps/expo/features/packs/hooks/useRecentPacks.ts b/apps/expo/features/packs/hooks/useRecentPacks.ts
index c6e3818f34..b70ac28414 100644
--- a/apps/expo/features/packs/hooks/useRecentPacks.ts
+++ b/apps/expo/features/packs/hooks/useRecentPacks.ts
@@ -18,7 +18,7 @@ export function useRecentPacks() {
 
     const sortedPacksWithWeights = sortedPacks.map((pack) => {
       const items = getPackItems(pack.id);
-      const packWithWeights = computePackWeights({ ...pack, items });
+      const packWithWeights = computePackWeights({ pack: { ...pack, items } });
       return packWithWeights;
     });
 
diff --git a/apps/expo/features/packs/hooks/useUpdatePack.ts b/apps/expo/features/packs/hooks/useUpdatePack.ts
index 638504bc70..b18203e86e 100644
--- a/apps/expo/features/packs/hooks/useUpdatePack.ts
+++ b/apps/expo/features/packs/hooks/useUpdatePack.ts
@@ -5,7 +5,7 @@ import type { Pack } from '../types';
 
 export function useUpdatePack() {
   const updatePack = useCallback((pack: Pack) => {
-    obs(packsStore, pack.id).set({
+    obs({ store: packsStore, id: pack.id }).set({
       ...pack,
       localUpdatedAt: new Date().toISOString(),
     });
diff --git a/apps/expo/features/packs/screens/CreatePackItemForm.tsx b/apps/expo/features/packs/screens/CreatePackItemForm.tsx
index 324de70dd7..518d2ba97c 100644
--- a/apps/expo/features/packs/screens/CreatePackItemForm.tsx
+++ b/apps/expo/features/packs/screens/CreatePackItemForm.tsx
@@ -326,7 +326,7 @@ export const CreatePackItemForm = ({
                   <Text className="text-foreground/70 mb-2 text-sm">{t('packs.unit')}</Text>
                   <SegmentedControl
                     values={WEIGHT_UNITS}
-                    selectedIndex={safeIndexOf(WEIGHT_UNITS, field.state.value)}
+                    selectedIndex={safeIndexOf({ array: WEIGHT_UNITS, value: field.state.value })}
                     onIndexChange={(index) => {
                       const selectedUnit = WEIGHT_UNITS[index];
                       if (selectedUnit) {
diff --git a/apps/expo/features/packs/screens/ItemsScanScreen.tsx b/apps/expo/features/packs/screens/ItemsScanScreen.tsx
index 4f6093118f..2edf22ced8 100644
--- a/apps/expo/features/packs/screens/ItemsScanScreen.tsx
+++ b/apps/expo/features/packs/screens/ItemsScanScreen.tsx
@@ -153,7 +153,7 @@ export function ItemsScanScreen() {
 
   const handleCatalogItemsSelected = async () => {
     router.back();
-    await addItemsToPack(packId as string, selectedCatalogItemsList);
+    await addItemsToPack({ packId: packId as string, catalogItems: selectedCatalogItemsList });
     Burnt.toast({
       title: `Added ${selectedCatalogItemsList.length} items to your pack`,
       preset: 'done',
diff --git a/apps/expo/features/packs/screens/PackDetailScreen.tsx b/apps/expo/features/packs/screens/PackDetailScreen.tsx
index 78d45b6e1d..c8bdd8e450 100644
--- a/apps/expo/features/packs/screens/PackDetailScreen.tsx
+++ b/apps/expo/features/packs/screens/PackDetailScreen.tsx
@@ -40,7 +40,7 @@ export function PackDetailScreen() {
   const [activeTab, setActiveTab] = useState(DEFAULT_TAB);
   const [isPackingMode, setIsPackingMode] = useState(false);
   const [packedItems, setPackedItems] = useState<Record<string, boolean>>(
-    obs(packingModeStore, id).get() || {},
+    obs({ store: packingModeStore, id: id }).get() || {},
   );
 
   const [isLocationPickerOpen, setIsLocationPickerOpen] = useState(false);
@@ -103,7 +103,7 @@ export function PackDetailScreen() {
   };
 
   const handleSavePackingMode = () => {
-    obs(packingModeStore, id).set({ ...packedItems });
+    obs({ store: packingModeStore, id: id }).set({ ...packedItems });
     setIsPackingMode(false);
     setActiveTab(DEFAULT_TAB); // Reset tab when toggling mode
     Burnt.toast({
@@ -116,10 +116,10 @@ export function PackDetailScreen() {
     const exitPackingMode = () => {
       setIsPackingMode(!isPackingMode);
       setActiveTab(DEFAULT_TAB); // Reset tab when toggling mode
-      setPackedItems(obs(packingModeStore, id).get() || {});
+      setPackedItems(obs({ store: packingModeStore, id: id }).get() || {});
     };
 
-    const packingState = obs(packingModeStore, id).get() || {};
+    const packingState = obs({ store: packingModeStore, id: id }).get() || {};
 
     if (
       Object.entries(packedItems).every(([key, val]) =>
diff --git a/apps/expo/features/packs/store/packItems.ts b/apps/expo/features/packs/store/packItems.ts
index e7d88f1744..4411008df9 100644
--- a/apps/expo/features/packs/store/packItems.ts
+++ b/apps/expo/features/packs/store/packItems.ts
@@ -23,7 +23,10 @@ const listAllPackItems = async (): Promise<PackItem[] | null> => {
 
 const createPackItem = async ({ packId, ...data }: PackItem): Promise<PackItem | null> => {
   if (data.image && !isRemoteUrl(data.image)) {
-    await uploadImage(data.image, `${ImageCacheManager.cacheDirectory}${data.image}`);
+    await uploadImage({
+      fileName: data.image,
+      uri: `${ImageCacheManager.cacheDirectory}${data.image}`,
+    });
   }
   const { data: result, error } = await apiClient
     .packs({ packId: String(packId) })
@@ -35,7 +38,10 @@ const createPackItem = async ({ packId, ...data }: PackItem): Promise<PackItem |
 
 const updatePackItem = async ({ id, ...data }: PackItem): Promise<PackItem | null> => {
   if (data.image && !isRemoteUrl(data.image)) {
-    await uploadImage(data.image, `${ImageCacheManager.cacheDirectory}${data.image}`);
+    await uploadImage({
+      fileName: data.image,
+      uri: `${ImageCacheManager.cacheDirectory}${data.image}`,
+    });
   }
   const { data: result, error } = await apiClient.packs.items({ itemId: String(id) }).patch(data);
   if (error) throw new Error(`Failed to update pack item: ${error.value}`);
diff --git a/apps/expo/features/packs/store/packWeightHistory.ts b/apps/expo/features/packs/store/packWeightHistory.ts
index 8a5f979ce6..472c6353cc 100644
--- a/apps/expo/features/packs/store/packWeightHistory.ts
+++ b/apps/expo/features/packs/store/packWeightHistory.ts
@@ -66,14 +66,14 @@ syncObservable(
 );
 
 export function recordPackWeight(packId: string) {
-  const pack = obs(packsStore, packId).peek();
+  const pack = obs({ store: packsStore, id: packId }).peek();
   const packItems = Object.values(packItemsStore.peek()).filter(
     (item) => item.packId === packId && !item.deleted,
   );
-  const { totalWeight } = computePackWeights({ ...pack, items: packItems });
+  const { totalWeight } = computePackWeights({ pack: { ...pack, items: packItems } });
   const id = nanoid();
 
-  obs(packWeigthHistoryStore, id).set({
+  obs({ store: packWeigthHistoryStore, id: id }).set({
     id,
     packId,
     weight: totalWeight,
diff --git a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
index 80b1608278..10599e629b 100644
--- a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
@@ -30,7 +30,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(250); // (100 * 2) + (50 * 1)
       expect(result.baseWeight).toBe(250);
@@ -53,7 +53,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(1000); // 1 kg = 1000 g
       expect(result.baseWeight).toBe(1000);
@@ -87,7 +87,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(1500); // 1000 + 500
       expect(result.baseWeight).toBe(1000); // only tent (food is consumable)
@@ -128,7 +128,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(4000); // 2000 + (500 * 2) + 1000
       expect(result.baseWeight).toBe(2000); // only backpack
@@ -162,7 +162,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(1300); // 1000 + 300
       expect(result.baseWeight).toBe(1000); // only tent (jacket is worn)
@@ -203,7 +203,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(3100); // 2000 + 300 + 800
       expect(result.baseWeight).toBe(2000); // only backpack
@@ -246,7 +246,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(1800); // 1000 + 500 + 300
       expect(result.baseWeight).toBe(1000); // only tent
@@ -271,7 +271,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(1000);
     });
@@ -293,7 +293,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack, 'oz');
+      const result = computePackWeights({ pack, preferredUnit: 'oz' });
 
       expect(result.totalWeight).toBeCloseTo(10, 1);
     });
@@ -315,7 +315,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack, 'kg');
+      const result = computePackWeights({ pack, preferredUnit: 'kg' });
 
       expect(result.totalWeight).toBe(2);
     });
@@ -337,7 +337,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack, 'lb');
+      const result = computePackWeights({ pack, preferredUnit: 'lb' });
 
       expect(result.totalWeight).toBeCloseTo(1, 1);
     });
@@ -351,7 +351,7 @@ describe('computePackWeights', () => {
         items: [] as PackItem[],
       } as unknown as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(0);
       expect(result.baseWeight).toBe(0);
@@ -374,7 +374,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(0);
       expect(result.baseWeight).toBe(0);
@@ -397,7 +397,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.totalWeight).toBe(100.12);
       expect(result.baseWeight).toBe(100.12);
@@ -411,7 +411,7 @@ describe('computePackWeights', () => {
         items: [] as PackItem[],
       } as unknown as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack);
+      const result = computePackWeights({ pack });
 
       expect(result.id).toBe('1');
       expect(result.name).toBe('Test Pack');
@@ -473,7 +473,7 @@ describe('computePackWeights', () => {
         ],
       } as Omit<Pack, 'baseWeight' | 'totalWeight'>;
 
-      const result = computePackWeights(pack, 'kg');
+      const result = computePackWeights({ pack, preferredUnit: 'kg' });
 
       expect(result.totalWeight).toBe(6.4); // 1.5 + 1 + 2.4 + 0.5 + 1
       expect(result.baseWeight).toBe(2.5); // 1.5 + 1 (tent + sleeping bag only)
diff --git a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
index 852d0124d9..7cef88a41d 100644
--- a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
@@ -4,109 +4,109 @@ import { convertFromGrams } from '../convertFromGrams';
 describe('convertFromGrams', () => {
   describe('metric conversions', () => {
     it('returns same value for grams', () => {
-      expect(convertFromGrams(100, 'g')).toBe(100);
-      expect(convertFromGrams(0, 'g')).toBe(0);
-      expect(convertFromGrams(1, 'g')).toBe(1);
+      expect(convertFromGrams({ grams: 100, unit: 'g' })).toBe(100);
+      expect(convertFromGrams({ grams: 0, unit: 'g' })).toBe(0);
+      expect(convertFromGrams({ grams: 1, unit: 'g' })).toBe(1);
     });
 
     it('converts grams to kilograms correctly', () => {
-      expect(convertFromGrams(1000, 'kg')).toBe(1);
-      expect(convertFromGrams(2500, 'kg')).toBe(2.5);
-      expect(convertFromGrams(100, 'kg')).toBe(0.1);
-      expect(convertFromGrams(500, 'kg')).toBe(0.5);
+      expect(convertFromGrams({ grams: 1000, unit: 'kg' })).toBe(1);
+      expect(convertFromGrams({ grams: 2500, unit: 'kg' })).toBe(2.5);
+      expect(convertFromGrams({ grams: 100, unit: 'kg' })).toBe(0.1);
+      expect(convertFromGrams({ grams: 500, unit: 'kg' })).toBe(0.5);
     });
   });
 
   describe('imperial conversions (NIST avoirdupois values)', () => {
     it('converts grams to ounces correctly', () => {
-      expect(convertFromGrams(28.349523125, 'oz')).toBe(1); // exact NIST value
-      expect(convertFromGrams(56.69904625, 'oz')).toBeCloseTo(2, 10);
-      expect(convertFromGrams(14.174761562, 'oz')).toBeCloseTo(0.5, 8);
+      expect(convertFromGrams({ grams: 28.349523125, unit: 'oz' })).toBe(1); // exact NIST value
+      expect(convertFromGrams({ grams: 56.69904625, unit: 'oz' })).toBeCloseTo(2, 10);
+      expect(convertFromGrams({ grams: 14.174761562, unit: 'oz' })).toBeCloseTo(0.5, 8);
     });
 
     it('converts grams to pounds correctly', () => {
-      expect(convertFromGrams(453.59237, 'lb')).toBe(1); // exact NIST value
-      expect(convertFromGrams(907.18474, 'lb')).toBeCloseTo(2, 10);
-      expect(convertFromGrams(226.796185, 'lb')).toBeCloseTo(0.5, 8);
+      expect(convertFromGrams({ grams: 453.59237, unit: 'lb' })).toBe(1); // exact NIST value
+      expect(convertFromGrams({ grams: 907.18474, unit: 'lb' })).toBeCloseTo(2, 10);
+      expect(convertFromGrams({ grams: 226.796185, unit: 'lb' })).toBeCloseTo(0.5, 8);
     });
   });
 
   describe('edge cases', () => {
     it('handles zero weight', () => {
-      expect(convertFromGrams(0, 'kg')).toBe(0);
-      expect(convertFromGrams(0, 'oz')).toBe(0);
-      expect(convertFromGrams(0, 'lb')).toBe(0);
-      expect(convertFromGrams(0, 'g')).toBe(0);
+      expect(convertFromGrams({ grams: 0, unit: 'kg' })).toBe(0);
+      expect(convertFromGrams({ grams: 0, unit: 'oz' })).toBe(0);
+      expect(convertFromGrams({ grams: 0, unit: 'lb' })).toBe(0);
+      expect(convertFromGrams({ grams: 0, unit: 'g' })).toBe(0);
     });
 
     it('handles very small weights', () => {
-      expect(convertFromGrams(1, 'kg')).toBe(0.001);
-      expect(convertFromGrams(1, 'oz')).toBeCloseTo(0.03527, 4);
-      expect(convertFromGrams(1, 'lb')).toBeCloseTo(0.002205, 4);
+      expect(convertFromGrams({ grams: 1, unit: 'kg' })).toBe(0.001);
+      expect(convertFromGrams({ grams: 1, unit: 'oz' })).toBeCloseTo(0.03527, 4);
+      expect(convertFromGrams({ grams: 1, unit: 'lb' })).toBeCloseTo(0.002205, 4);
     });
 
     it('handles very large weights', () => {
-      expect(convertFromGrams(1000000, 'kg')).toBe(1000);
+      expect(convertFromGrams({ grams: 1000000, unit: 'kg' })).toBe(1000);
       // 1,000,000 / 28.349523125 ≈ 35273.96 (NIST exact, not the old 35273.37)
-      expect(convertFromGrams(1000000, 'oz')).toBeCloseTo(35273.96, 1);
-      expect(convertFromGrams(1000000, 'lb')).toBeCloseTo(2204.62, 0);
+      expect(convertFromGrams({ grams: 1000000, unit: 'oz' })).toBeCloseTo(35273.96, 1);
+      expect(convertFromGrams({ grams: 1000000, unit: 'lb' })).toBeCloseTo(2204.62, 0);
     });
 
     it('handles negative weights', () => {
-      expect(convertFromGrams(-1000, 'kg')).toBe(-1);
-      expect(convertFromGrams(-28.349523125, 'oz')).toBeCloseTo(-1, 10);
-      expect(convertFromGrams(-453.59237, 'lb')).toBeCloseTo(-1, 10);
+      expect(convertFromGrams({ grams: -1000, unit: 'kg' })).toBe(-1);
+      expect(convertFromGrams({ grams: -28.349523125, unit: 'oz' })).toBeCloseTo(-1, 10);
+      expect(convertFromGrams({ grams: -453.59237, unit: 'lb' })).toBeCloseTo(-1, 10);
     });
   });
 
   describe('round-trip conversions (using same factor both ways)', () => {
     it('maintains exact accuracy when converting to grams and back', () => {
-      const ozValue = convertFromGrams(100, 'oz');
+      const ozValue = convertFromGrams({ grams: 100, unit: 'oz' });
       expect(ozValue).toBeCloseTo(3.527, 3);
 
-      const lbValue = convertFromGrams(1000, 'lb');
+      const lbValue = convertFromGrams({ grams: 1000, unit: 'lb' });
       expect(lbValue).toBeCloseTo(2.205, 3);
     });
   });
 
   describe('decimal precision', () => {
     it('handles decimal weights accurately', () => {
-      expect(convertFromGrams(1500, 'kg')).toBe(1.5);
-      expect(convertFromGrams(123.456, 'kg')).toBeCloseTo(0.123456, 6);
-      expect(convertFromGrams(123.456, 'oz')).toBeCloseTo(4.355, 2);
-      expect(convertFromGrams(123.456, 'lb')).toBeCloseTo(0.272, 3);
+      expect(convertFromGrams({ grams: 1500, unit: 'kg' })).toBe(1.5);
+      expect(convertFromGrams({ grams: 123.456, unit: 'kg' })).toBeCloseTo(0.123456, 6);
+      expect(convertFromGrams({ grams: 123.456, unit: 'oz' })).toBeCloseTo(4.355, 2);
+      expect(convertFromGrams({ grams: 123.456, unit: 'lb' })).toBeCloseTo(0.272, 3);
     });
   });
 
   describe('real-world scenarios', () => {
     it('converts typical camping gear weights correctly', () => {
-      expect(convertFromGrams(1814.369, 'lb')).toBeCloseTo(4, 1);
-      expect(convertFromGrams(1133.981, 'lb')).toBeCloseTo(2.5, 1);
-      expect(convertFromGrams(680.388, 'oz')).toBeCloseTo(24, 0);
-      expect(convertFromGrams(1500, 'kg')).toBe(1.5);
+      expect(convertFromGrams({ grams: 1814.369, unit: 'lb' })).toBeCloseTo(4, 1);
+      expect(convertFromGrams({ grams: 1133.981, unit: 'lb' })).toBeCloseTo(2.5, 1);
+      expect(convertFromGrams({ grams: 680.388, unit: 'oz' })).toBeCloseTo(24, 0);
+      expect(convertFromGrams({ grams: 1500, unit: 'kg' })).toBe(1.5);
     });
 
     it('handles ultralight gear weights', () => {
-      expect(convertFromGrams(226.796, 'oz')).toBeCloseTo(8, 0);
-      expect(convertFromGrams(14.1748, 'oz')).toBeCloseTo(0.5, 1);
-      expect(convertFromGrams(250, 'g')).toBe(250);
+      expect(convertFromGrams({ grams: 226.796, unit: 'oz' })).toBeCloseTo(8, 0);
+      expect(convertFromGrams({ grams: 14.1748, unit: 'oz' })).toBeCloseTo(0.5, 1);
+      expect(convertFromGrams({ grams: 250, unit: 'g' })).toBe(250);
     });
 
     it('converts between metric and imperial for common weights', () => {
       // 1 kg in lbs
-      expect(convertFromGrams(1000, 'lb')).toBeCloseTo(2.20462, 4);
+      expect(convertFromGrams({ grams: 1000, unit: 'lb' })).toBeCloseTo(2.20462, 4);
       // 1 oz in kg
-      expect(convertFromGrams(28.349523125, 'kg')).toBeCloseTo(0.02835, 5);
+      expect(convertFromGrams({ grams: 28.349523125, unit: 'kg' })).toBeCloseTo(0.02835, 5);
     });
   });
 
   describe('display formatting scenarios', () => {
     it('provides sensible values for UI display', () => {
-      const heavyItem = convertFromGrams(1000, 'oz'); // ~35.27 oz
+      const heavyItem = convertFromGrams({ grams: 1000, unit: 'oz' }); // ~35.27 oz
       expect(heavyItem).toBeGreaterThan(35);
       expect(heavyItem).toBeLessThan(36);
 
-      const lightKg = convertFromGrams(250, 'kg'); // 0.25 kg
+      const lightKg = convertFromGrams({ grams: 250, unit: 'kg' }); // 0.25 kg
       expect(lightKg).toBe(0.25);
     });
   });
diff --git a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
index 0e392d7368..408e7dc857 100644
--- a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
@@ -4,85 +4,85 @@ import { convertToGrams } from '../convertToGrams';
 describe('convertToGrams', () => {
   describe('metric conversions', () => {
     it('returns same value for grams', () => {
-      expect(convertToGrams(100, 'g')).toBe(100);
-      expect(convertToGrams(0, 'g')).toBe(0);
-      expect(convertToGrams(1, 'g')).toBe(1);
+      expect(convertToGrams({ weight: 100, unit: 'g' })).toBe(100);
+      expect(convertToGrams({ weight: 0, unit: 'g' })).toBe(0);
+      expect(convertToGrams({ weight: 1, unit: 'g' })).toBe(1);
     });
 
     it('converts kilograms to grams correctly', () => {
-      expect(convertToGrams(1, 'kg')).toBe(1000);
-      expect(convertToGrams(2.5, 'kg')).toBe(2500);
-      expect(convertToGrams(0.1, 'kg')).toBe(100);
+      expect(convertToGrams({ weight: 1, unit: 'kg' })).toBe(1000);
+      expect(convertToGrams({ weight: 2.5, unit: 'kg' })).toBe(2500);
+      expect(convertToGrams({ weight: 0.1, unit: 'kg' })).toBe(100);
     });
   });
 
   describe('imperial conversions (NIST avoirdupois values)', () => {
     it('converts ounces to grams correctly', () => {
-      expect(convertToGrams(1, 'oz')).toBe(28.349523125);
-      expect(convertToGrams(16, 'oz')).toBeCloseTo(453.59237, 4); // 1 lb worth
-      expect(convertToGrams(0.5, 'oz')).toBeCloseTo(14.174761562, 6);
+      expect(convertToGrams({ weight: 1, unit: 'oz' })).toBe(28.349523125);
+      expect(convertToGrams({ weight: 16, unit: 'oz' })).toBeCloseTo(453.59237, 4); // 1 lb worth
+      expect(convertToGrams({ weight: 0.5, unit: 'oz' })).toBeCloseTo(14.174761562, 6);
     });
 
     it('converts pounds to grams correctly', () => {
-      expect(convertToGrams(1, 'lb')).toBe(453.59237);
-      expect(convertToGrams(2, 'lb')).toBeCloseTo(907.18474, 4);
-      expect(convertToGrams(0.5, 'lb')).toBeCloseTo(226.796185, 4);
+      expect(convertToGrams({ weight: 1, unit: 'lb' })).toBe(453.59237);
+      expect(convertToGrams({ weight: 2, unit: 'lb' })).toBeCloseTo(907.18474, 4);
+      expect(convertToGrams({ weight: 0.5, unit: 'lb' })).toBeCloseTo(226.796185, 4);
     });
   });
 
   describe('edge cases', () => {
     it('handles zero weight', () => {
-      expect(convertToGrams(0, 'kg')).toBe(0);
-      expect(convertToGrams(0, 'oz')).toBe(0);
-      expect(convertToGrams(0, 'lb')).toBe(0);
+      expect(convertToGrams({ weight: 0, unit: 'kg' })).toBe(0);
+      expect(convertToGrams({ weight: 0, unit: 'oz' })).toBe(0);
+      expect(convertToGrams({ weight: 0, unit: 'lb' })).toBe(0);
     });
 
     it('handles very small weights', () => {
-      expect(convertToGrams(0.001, 'kg')).toBe(1);
-      expect(convertToGrams(0.001, 'oz')).toBeCloseTo(0.028349523125, 8);
+      expect(convertToGrams({ weight: 0.001, unit: 'kg' })).toBe(1);
+      expect(convertToGrams({ weight: 0.001, unit: 'oz' })).toBeCloseTo(0.028349523125, 8);
     });
 
     it('handles very large weights', () => {
-      expect(convertToGrams(1000, 'kg')).toBe(1000000);
-      expect(convertToGrams(1000, 'lb')).toBeCloseTo(453592.37, 1);
+      expect(convertToGrams({ weight: 1000, unit: 'kg' })).toBe(1000000);
+      expect(convertToGrams({ weight: 1000, unit: 'lb' })).toBeCloseTo(453592.37, 1);
     });
 
     it('handles negative weights', () => {
-      expect(convertToGrams(-1, 'kg')).toBe(-1000);
-      expect(convertToGrams(-1, 'oz')).toBe(-28.349523125);
+      expect(convertToGrams({ weight: -1, unit: 'kg' })).toBe(-1000);
+      expect(convertToGrams({ weight: -1, unit: 'oz' })).toBe(-28.349523125);
     });
 
     it('returns weight unchanged for unknown units (falls back to g)', () => {
-      expect(convertToGrams(100, 'invalid')).toBe(100);
-      expect(convertToGrams(100, '')).toBe(100);
-      expect(convertToGrams(100, 'stone')).toBe(100);
+      expect(convertToGrams({ weight: 100, unit: 'invalid' })).toBe(100);
+      expect(convertToGrams({ weight: 100, unit: '' })).toBe(100);
+      expect(convertToGrams({ weight: 100, unit: 'stone' })).toBe(100);
     });
   });
 
   describe('decimal precision', () => {
     it('handles decimal weights accurately', () => {
-      expect(convertToGrams(1.5, 'kg')).toBe(1500);
-      expect(convertToGrams(2.75, 'oz')).toBeCloseTo(77.961188, 4);
-      expect(convertToGrams(3.333, 'lb')).toBeCloseTo(1511.82, 2);
+      expect(convertToGrams({ weight: 1.5, unit: 'kg' })).toBe(1500);
+      expect(convertToGrams({ weight: 2.75, unit: 'oz' })).toBeCloseTo(77.961188, 4);
+      expect(convertToGrams({ weight: 3.333, unit: 'lb' })).toBeCloseTo(1511.82, 2);
     });
 
     it('preserves precision for very precise decimal inputs', () => {
-      expect(convertToGrams(0.123456, 'kg')).toBeCloseTo(123.456, 3);
+      expect(convertToGrams({ weight: 0.123456, unit: 'kg' })).toBeCloseTo(123.456, 3);
     });
   });
 
   describe('real-world scenarios', () => {
     it('converts typical camping gear weights correctly', () => {
-      expect(convertToGrams(4, 'lb')).toBeCloseTo(1814.369, 2);
-      expect(convertToGrams(2.5, 'lb')).toBeCloseTo(1133.981, 2);
-      expect(convertToGrams(24, 'oz')).toBeCloseTo(680.388, 2);
-      expect(convertToGrams(1.5, 'kg')).toBe(1500);
+      expect(convertToGrams({ weight: 4, unit: 'lb' })).toBeCloseTo(1814.369, 2);
+      expect(convertToGrams({ weight: 2.5, unit: 'lb' })).toBeCloseTo(1133.981, 2);
+      expect(convertToGrams({ weight: 24, unit: 'oz' })).toBeCloseTo(680.388, 2);
+      expect(convertToGrams({ weight: 1.5, unit: 'kg' })).toBe(1500);
     });
 
     it('handles ultralight gear weights', () => {
-      expect(convertToGrams(8, 'oz')).toBeCloseTo(226.796, 2);
-      expect(convertToGrams(0.5, 'oz')).toBeCloseTo(14.1748, 3);
-      expect(convertToGrams(250, 'g')).toBe(250);
+      expect(convertToGrams({ weight: 8, unit: 'oz' })).toBeCloseTo(226.796, 2);
+      expect(convertToGrams({ weight: 0.5, unit: 'oz' })).toBeCloseTo(14.1748, 3);
+      expect(convertToGrams({ weight: 250, unit: 'g' })).toBe(250);
     });
   });
 });
diff --git a/apps/expo/features/packs/utils/computeCategories.ts b/apps/expo/features/packs/utils/computeCategories.ts
index ead666b091..362c0f05bc 100644
--- a/apps/expo/features/packs/utils/computeCategories.ts
+++ b/apps/expo/features/packs/utils/computeCategories.ts
@@ -11,14 +11,19 @@ export type CategorySummary = {
 };
 
 export function computeCategorySummaries(pack: Pack): CategorySummary[] {
-  const preferredUnit = parseWeightUnit(userStore.preferredWeightUnit.peek(), 'g');
+  const preferredUnit = parseWeightUnit({
+    value: userStore.preferredWeightUnit.peek(),
+    fallback: 'g',
+  });
   const categoryMap: Record<string, { weightInGrams: number; items: number }> = {};
 
   let totalWeightGrams = 0;
 
   for (const item of pack.items) {
     const category = item.category?.trim() || 'Other';
-    const itemGrams = normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+    const itemGrams =
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
 
     totalWeightGrams += itemGrams;
 
@@ -34,7 +39,7 @@ export function computeCategorySummaries(pack: Pack): CategorySummary[] {
   return Object.entries(categoryMap).map(([name, data]) => ({
     name,
     items: data.items,
-    weight: displayWeight(data.weightInGrams, preferredUnit),
+    weight: displayWeight({ grams: data.weightInGrams, unit: preferredUnit }),
     percentage: Number(
       (totalWeightGrams > 0 ? (data.weightInGrams / totalWeightGrams) * 100 : 0).toFixed(1),
     ),
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts
index 396115d900..85c653af8a 100644
--- a/apps/expo/features/packs/utils/computePackWeights.ts
+++ b/apps/expo/features/packs/utils/computePackWeights.ts
@@ -2,16 +2,20 @@ import type { WeightUnit } from '@packrat/units';
 import { displayWeight, normalize, parseWeightUnit } from '@packrat/units';
 import type { Pack } from '../types';
 
-export const computePackWeights = (
-  pack: Omit<Pack, 'baseWeight' | 'totalWeight'>,
-  preferredUnit: WeightUnit = 'g',
-): Pack => {
+export const computePackWeights = ({
+  pack,
+  preferredUnit = 'g',
+}: {
+  pack: Omit<Pack, 'baseWeight' | 'totalWeight'>;
+  preferredUnit?: WeightUnit;
+}): Pack => {
   let baseWeightGrams = 0;
   let totalWeightGrams = 0;
 
   for (const item of pack.items) {
     const itemWeightInGrams =
-      normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
     totalWeightGrams += itemWeightInGrams;
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
@@ -20,7 +24,7 @@ export const computePackWeights = (
 
   return {
     ...pack,
-    baseWeight: displayWeight(baseWeightGrams, preferredUnit),
-    totalWeight: displayWeight(totalWeightGrams, preferredUnit),
+    baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }),
+    totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }),
   };
 };
diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/apps/expo/features/packs/utils/convertFromGrams.ts
index a7fcd200b0..bd54cb3f40 100644
--- a/apps/expo/features/packs/utils/convertFromGrams.ts
+++ b/apps/expo/features/packs/utils/convertFromGrams.ts
@@ -1,4 +1,5 @@
 import type { WeightUnit } from '@packrat/units';
 import { fromGrams } from '@packrat/units';
 
-export const convertFromGrams = (grams: number, unit: WeightUnit): number => fromGrams(grams, unit);
+export const convertFromGrams = ({ grams, unit }: { grams: number; unit: WeightUnit }): number =>
+  fromGrams({ grams, unit });
diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/apps/expo/features/packs/utils/convertToGrams.ts
index 15f55700ac..e136bd87e9 100644
--- a/apps/expo/features/packs/utils/convertToGrams.ts
+++ b/apps/expo/features/packs/utils/convertToGrams.ts
@@ -1,5 +1,5 @@
 import { normalize, parseWeightUnit } from '@packrat/units';
 
-export function convertToGrams(weight: number, unit: string): number {
-  return normalize(weight, parseWeightUnit(unit));
+export function convertToGrams({ weight, unit }: { weight: number; unit: string }): number {
+  return normalize({ weight, unit: parseWeightUnit({ value: unit }) });
 }
diff --git a/apps/expo/features/packs/utils/uploadImage.ts b/apps/expo/features/packs/utils/uploadImage.ts
index 384c2bc8a1..a14792a708 100644
--- a/apps/expo/features/packs/utils/uploadImage.ts
+++ b/apps/expo/features/packs/utils/uploadImage.ts
@@ -2,7 +2,13 @@ import { userStore } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import * as FileSystem from 'expo-file-system/legacy';
 
-export const uploadImage = async (fileName: string, uri: string): Promise<string | undefined> => {
+export const uploadImage = async ({
+  fileName,
+  uri,
+}: {
+  fileName: string;
+  uri: string;
+}): Promise<string | undefined> => {
   if (!fileName || fileName.trim() === '') {
     console.warn('Skipping upload: fileName is empty');
     return;
@@ -12,7 +18,10 @@ export const uploadImage = async (fileName: string, uri: string): Promise<string
     const fileExtension = fileName.split('.').pop()?.toLowerCase() || 'jpg';
     const type = `image/${fileExtension === 'jpg' ? 'jpeg' : fileExtension}`;
     const remoteFileName = `${userStore.id.peek()}-${fileName}`;
-    const { url: presignedUrl } = await getPresignedUrl(remoteFileName, type);
+    const { url: presignedUrl } = await getPresignedUrl({
+      fileName: remoteFileName,
+      contentType: type,
+    });
 
     const uploadResult = await FileSystem.uploadAsync(presignedUrl, uri, {
       httpMethod: 'PUT',
@@ -32,7 +41,13 @@ export const uploadImage = async (fileName: string, uri: string): Promise<string
   }
 };
 
-const getPresignedUrl = async (fileName: string, contentType: string) => {
+const getPresignedUrl = async ({
+  fileName,
+  contentType,
+}: {
+  fileName: string;
+  contentType: string;
+}) => {
   const { data, error } = await apiClient.upload.presigned.get({
     query: { fileName, contentType },
   });
diff --git a/apps/expo/features/packs/utils/uploadImage.web.ts b/apps/expo/features/packs/utils/uploadImage.web.ts
index bda654704a..82bd91346d 100644
--- a/apps/expo/features/packs/utils/uploadImage.web.ts
+++ b/apps/expo/features/packs/utils/uploadImage.web.ts
@@ -7,10 +7,13 @@
 import { userStore } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 
-export const uploadImage = async (
-  fileName: string,
-  blobOrDataUrl: string,
-): Promise<string | undefined> => {
+export const uploadImage = async ({
+  fileName,
+  uri,
+}: {
+  fileName: string;
+  uri: string;
+}): Promise<string | undefined> => {
   if (!fileName || fileName.trim() === '') {
     console.warn('Skipping upload: fileName is empty');
     return;
@@ -21,10 +24,13 @@ export const uploadImage = async (
     const type = `image/${fileExtension === 'jpg' ? 'jpeg' : fileExtension}`;
     const remoteFileName = `${userStore.id.peek()}-${fileName}`;
 
-    const { url: presignedUrl } = await getPresignedUrl(remoteFileName, type);
+    const { url: presignedUrl } = await getPresignedUrl({
+      fileName: remoteFileName,
+      contentType: type,
+    });
 
     // Convert data URL / blob URL to a Blob for upload
-    const blob = await urlToBlob(blobOrDataUrl, type);
+    const blob = await urlToBlob({ url: uri, type });
 
     const uploadResponse = await fetch(presignedUrl, {
       method: 'PUT',
@@ -43,10 +49,13 @@ export const uploadImage = async (
   }
 };
 
-const getPresignedUrl = async (
-  fileName: string,
-  contentType: string,
-): Promise<{ url: string; publicUrl: string; objectKey: string }> => {
+const getPresignedUrl = async ({
+  fileName,
+  contentType,
+}: {
+  fileName: string;
+  contentType: string;
+}): Promise<{ url: string; publicUrl: string; objectKey: string }> => {
   const { data, error } = await apiClient.upload.presigned.get({
     query: { fileName, contentType },
   });
@@ -54,7 +63,7 @@ const getPresignedUrl = async (
   return data;
 };
 
-async function urlToBlob(url: string, type: string): Promise<Blob> {
+async function urlToBlob({ url, type }: { url: string; type: string }): Promise<Blob> {
   if (url.startsWith('data:')) {
     const arr = url.split(',');
     const bstr = atob(arr[1] ?? '');
diff --git a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
index f0887a9dad..5ac2853fc0 100644
--- a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
+++ b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
@@ -10,18 +10,24 @@ import type { TrailConditionReport } from '../types';
 
 const CACHE_KEY_PREFIX = 'trail_condition_reports_cache';
 
-function cacheKey(userId: string, trailName?: string): string {
+function cacheKey({ userId, trailName }: { userId: string; trailName?: string }): string {
   const base = `${CACHE_KEY_PREFIX}:${userId}`;
   return trailName ? `${base}:${trailName}` : base;
 }
 
 /** Persist fetched reports to AsyncStorage for offline / cold-start access. */
-async function writeCachedReports(
-  reports: TrailConditionReport[],
-  opts: { userId: string; trailName?: string },
-) {
+async function writeCachedReports({
+  reports,
+  opts,
+}: {
+  reports: TrailConditionReport[];
+  opts: { userId: string; trailName?: string };
+}) {
   try {
-    await AsyncStorage.setItem(cacheKey(opts.userId, opts.trailName), JSON.stringify(reports));
+    await AsyncStorage.setItem(
+      cacheKey({ userId: opts.userId, trailName: opts.trailName }),
+      JSON.stringify(reports),
+    );
   } catch {
     // Best-effort — swallow write errors silently
   }
@@ -33,7 +39,9 @@ async function readCachedReports(opts: {
   trailName?: string;
 }): Promise<TrailConditionReport[] | undefined> {
   try {
-    const raw = await AsyncStorage.getItem(cacheKey(opts.userId, opts.trailName));
+    const raw = await AsyncStorage.getItem(
+      cacheKey({ userId: opts.userId, trailName: opts.trailName }),
+    );
     // safe-cast: JSON.parse returns unknown; data was written as TrailConditionReport[] earlier
     if (raw) return JSON.parse(raw) as TrailConditionReport[];
   } catch {
@@ -107,7 +115,7 @@ export function useTrailConditionReports(trailName?: string) {
   useEffect(() => {
     if (query.data && query.data !== prevDataRef.current && query.isFetched) {
       prevDataRef.current = query.data;
-      writeCachedReports(query.data, { userId: currentUserId, trailName });
+      writeCachedReports({ reports: query.data, opts: { userId: currentUserId, trailName } });
     }
   }, [query.data, query.isFetched, currentUserId, trailName]);
 
diff --git a/apps/expo/features/trail-conditions/store/trailConditionReports.ts b/apps/expo/features/trail-conditions/store/trailConditionReports.ts
index 21a5989235..c4b8253a98 100644
--- a/apps/expo/features/trail-conditions/store/trailConditionReports.ts
+++ b/apps/expo/features/trail-conditions/store/trailConditionReports.ts
@@ -7,7 +7,7 @@ import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 import type { TrailConditionReportInStore } from '../types';
 
-const listMyReports = async (_params: unknown, { lastSync }: { lastSync?: number } = {}) => {
+const _listMyReportsImpl = async ({ lastSync }: { lastSync?: number } = {}) => {
   const { data, error } = await apiClient['trail-conditions'].mine.get({
     query: lastSync != null ? { updatedAt: new Date(lastSync + 1).toISOString() } : {},
   });
@@ -86,7 +86,7 @@ syncObservable(
       backoff: 'exponential',
       maxDelay: 30000,
     },
-    list: listMyReports,
+    list: (_params: unknown, opts?: { lastSync?: number }) => _listMyReportsImpl(opts),
     create: createReport,
     update: updateReport,
     changesSince: 'last-sync',
diff --git a/apps/expo/features/trips/components/TripCard.tsx b/apps/expo/features/trips/components/TripCard.tsx
index 000ca6c05f..aef934b570 100644
--- a/apps/expo/features/trips/components/TripCard.tsx
+++ b/apps/expo/features/trips/components/TripCard.tsx
@@ -17,7 +17,13 @@ interface TripCardProps {
   onPress?: (trip: Trip) => void;
 }
 
-function getTripDurationDays(startDate?: string, endDate?: string): number | null {
+function getTripDurationDays({
+  startDate,
+  endDate,
+}: {
+  startDate?: string;
+  endDate?: string;
+}): number | null {
   if (!startDate || !endDate) return null;
   const start = new Date(startDate);
   const end = new Date(endDate);
@@ -41,7 +47,7 @@ export function TripCard({ trip, onPress }: TripCardProps) {
   const alertRef = useRef<AlertMethods>(null);
   const insets = useSafeAreaInsets();
 
-  const durationDays = getTripDurationDays(trip.startDate, trip.endDate);
+  const durationDays = getTripDurationDays({ startDate: trip.startDate, endDate: trip.endDate });
 
   const handleActionsPress = () => {
     const options = [
diff --git a/apps/expo/features/trips/hooks/useCreateTrip.ts b/apps/expo/features/trips/hooks/useCreateTrip.ts
index 30cf45edbd..3c79492e68 100644
--- a/apps/expo/features/trips/hooks/useCreateTrip.ts
+++ b/apps/expo/features/trips/hooks/useCreateTrip.ts
@@ -17,7 +17,7 @@ export function useCreateTrip() {
       localUpdatedAt: timestamp,
       deleted: false,
     };
-    obs(tripsStore, id).set(newTrip);
+    obs({ store: tripsStore, id: id }).set(newTrip);
 
     return id;
   }, []);
diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/apps/expo/features/trips/hooks/useDeleteTrip.ts
index b85b73c0af..d67c3db035 100644
--- a/apps/expo/features/trips/hooks/useDeleteTrip.ts
+++ b/apps/expo/features/trips/hooks/useDeleteTrip.ts
@@ -5,7 +5,7 @@ import { useCallback } from 'react';
 export function useDeleteTrip() {
   const deleteTrip = useCallback((id: string) => {
     // Soft delete by setting deleted flag
-    const tripObs = obs(tripsStore, id);
+    const tripObs = obs({ store: tripsStore, id: id });
     if (tripObs) {
       tripObs.deleted.set(true);
     }
diff --git a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts b/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts
index 8c3909b4b7..f947fa1506 100644
--- a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts
+++ b/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts
@@ -11,7 +11,7 @@ import { obs } from 'expo-app/lib/store';
  */
 export function useTripDetailsFromStore(id: string) {
   const trip = use$(() => {
-    const trip_ = obs(tripsStore, id).get();
+    const trip_ = obs({ store: tripsStore, id: id }).get();
 
     return trip_;
   });
diff --git a/apps/expo/features/trips/hooks/useUpdateTrip.ts b/apps/expo/features/trips/hooks/useUpdateTrip.ts
index 47c8d8b3e8..c59821b82b 100644
--- a/apps/expo/features/trips/hooks/useUpdateTrip.ts
+++ b/apps/expo/features/trips/hooks/useUpdateTrip.ts
@@ -5,7 +5,7 @@ import type { Trip } from '../types';
 
 export function useUpdateTrip() {
   const updateTrip = useCallback((trip: Trip) => {
-    obs(tripsStore, trip.id).set({
+    obs({ store: tripsStore, id: trip.id }).set({
       ...trip,
       localUpdatedAt: new Date().toISOString(),
     });
diff --git a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx b/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx
index 7fa5b63ef7..b2aaf741ab 100644
--- a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx
+++ b/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx
@@ -43,7 +43,7 @@ export default function TripWeatherDetailsScreen() {
       setLoading(true);
       setError(null);
 
-      const locations = await searchLocationsByCoordinates(latitude, longitude);
+      const locations = await searchLocationsByCoordinates({ latitude, longitude });
       const first = locations[0];
       if (!first) throw new Error('No location found for these coordinates');
       const weather = await getWeatherData(first.id);
@@ -52,7 +52,7 @@ export default function TripWeatherDetailsScreen() {
       const weatherCode = weather.current?.condition?.code || 1000;
       const isNight = weather.current?.is_day === 0;
 
-      setGradientColors(getWeatherBackgroundColors(weatherCode, isNight));
+      setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight }));
     } catch (e) {
       console.error(e);
       setError('Failed to load weather');
diff --git a/apps/expo/features/weather/components/WeatherIcon.tsx b/apps/expo/features/weather/components/WeatherIcon.tsx
index 7cdf6ec53a..bce7995795 100644
--- a/apps/expo/features/weather/components/WeatherIcon.tsx
+++ b/apps/expo/features/weather/components/WeatherIcon.tsx
@@ -25,10 +25,10 @@ export function WeatherIcon({
 
   if (code !== undefined) {
     // If we have a code, use that for mapping
-    iconName = getWeatherIconName(code, isDay);
+    iconName = getWeatherIconName({ code, isDay });
   } else if (condition) {
     // If we have condition text, use that for mapping
-    iconName = getWeatherIconByCondition(condition, isDay);
+    iconName = getWeatherIconByCondition({ condition, isDay });
   } else {
     // Default fallback
     iconName = isDay ? 'weather-sunny' : 'weather-night';
diff --git a/apps/expo/features/weather/hooks/useLocationRefresh.ts b/apps/expo/features/weather/hooks/useLocationRefresh.ts
index c9ad3a8e92..2d1ee35a40 100644
--- a/apps/expo/features/weather/hooks/useLocationRefresh.ts
+++ b/apps/expo/features/weather/hooks/useLocationRefresh.ts
@@ -18,8 +18,11 @@ export function useLocationRefresh() {
       if (weatherData) {
         const formattedData = formatWeatherData(weatherData);
 
-        // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure
-        updateLocation(locationId, formattedData as unknown as Partial<WeatherLocation>);
+        updateLocation({
+          locationId,
+          // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure
+          updates: formattedData as unknown as Partial<WeatherLocation>,
+        });
 
         return true;
       }
@@ -48,8 +51,11 @@ export function useLocationRefresh() {
           if (weatherData) {
             const formattedData = formatWeatherData(weatherData);
 
-            // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure
-            updateLocation(location.id, formattedData as unknown as Partial<WeatherLocation>);
+            updateLocation({
+              locationId: location.id,
+              // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure
+              updates: formattedData as unknown as Partial<WeatherLocation>,
+            });
           }
         } catch (error) {
           console.error(`Error updating weather for ${location.name}:`, error);
diff --git a/apps/expo/features/weather/hooks/useLocationSearch.ts b/apps/expo/features/weather/hooks/useLocationSearch.ts
index 36574bf651..fedb6bb835 100644
--- a/apps/expo/features/weather/hooks/useLocationSearch.ts
+++ b/apps/expo/features/weather/hooks/useLocationSearch.ts
@@ -34,12 +34,18 @@ export function useLocationSearch() {
     }
   };
 
-  const searchByCoordinates = async (latitude: number, longitude: number) => {
+  const searchByCoordinates = async ({
+    latitude,
+    longitude,
+  }: {
+    latitude: number;
+    longitude: number;
+  }) => {
     setIsLoading(true);
     setError(null);
 
     try {
-      const searchResults = await searchLocationsByCoordinates(latitude, longitude);
+      const searchResults = await searchLocationsByCoordinates({ latitude, longitude });
 
       if (searchResults.length === 0) {
         setError('No locations found near your current position. Please try searching manually.');
diff --git a/apps/expo/features/weather/hooks/useLocations.ts b/apps/expo/features/weather/hooks/useLocations.ts
index 0be9178811..842fbec207 100644
--- a/apps/expo/features/weather/hooks/useLocations.ts
+++ b/apps/expo/features/weather/hooks/useLocations.ts
@@ -29,7 +29,13 @@ export function useLocations() {
     setBaseLocations(locations.filter((loc) => loc.id !== locationId));
   };
 
-  const updateLocation = (locationId: number, updates: Partial<WeatherLocation>) => {
+  const updateLocation = ({
+    locationId,
+    updates,
+  }: {
+    locationId: number;
+    updates: Partial<WeatherLocation>;
+  }) => {
     if (locationsState.state !== 'hasData') return;
 
     const locations = locationsState.data;
diff --git a/apps/expo/features/weather/hooks/useWeatherAlert.ts b/apps/expo/features/weather/hooks/useWeatherAlert.ts
index 1a462f2ad2..3278bec3ae 100644
--- a/apps/expo/features/weather/hooks/useWeatherAlert.ts
+++ b/apps/expo/features/weather/hooks/useWeatherAlert.ts
@@ -52,10 +52,13 @@ export type WeatherApiData = {
 
 type ActiveLocation = { name?: string } | null;
 
-export function generateAlerts(
-  data: WeatherApiData | undefined,
-  activeLocation: ActiveLocation,
-): WeatherAlert[] {
+export function generateAlerts({
+  data,
+  activeLocation,
+}: {
+  data: WeatherApiData | undefined;
+  activeLocation: ActiveLocation;
+}): WeatherAlert[] {
   const locationName = data?.location?.name || activeLocation?.name || 'Unknown';
   const apiAlerts = data?.alerts?.alert;
 
@@ -247,9 +250,11 @@ export function useWeatherAlerts() {
 
       try {
         const data = await getWeatherData(locationId);
-        // safe-cast: getWeatherData returns WeatherApiForecastResponse; WeatherApiData is a
-        // structural subset of that type used only by this alert generator.
-        const formatted = generateAlerts(data as unknown as WeatherApiData, activeLocation);
+        const formatted = generateAlerts({
+          // safe-cast: getWeatherData returns WeatherApiForecastResponse; WeatherApiData is a structural subset used only by this alert generator.
+          data: data as unknown as WeatherApiData,
+          activeLocation,
+        });
         setAlerts(formatted);
       } catch (err) {
         console.error('Weather alerts error:', err);
diff --git a/apps/expo/features/weather/lib/weatherIcons.ts b/apps/expo/features/weather/lib/weatherIcons.ts
index 29f986d0a7..78b4c09240 100644
--- a/apps/expo/features/weather/lib/weatherIcons.ts
+++ b/apps/expo/features/weather/lib/weatherIcons.ts
@@ -7,7 +7,13 @@ import type { MaterialIconName } from 'expo-app/components/Icon';
  * @returns The icon name to use
  */
 
-export function getWeatherIconName(code: number, isDay = 1): MaterialIconName {
+export function getWeatherIconName({
+  code,
+  isDay = 1,
+}: {
+  code: number;
+  isDay?: number;
+}): MaterialIconName {
   // Clear conditions
   if (code === 1000) {
     return isDay ? 'weather-sunny' : 'weather-night';
@@ -83,7 +89,13 @@ export function getWeatherIconName(code: number, isDay = 1): MaterialIconName {
  * @returns The icon name to use
  */
 
-export function getWeatherIconByCondition(condition: string, isDay = 1): MaterialIconName {
+export function getWeatherIconByCondition({
+  condition,
+  isDay = 1,
+}: {
+  condition: string;
+  isDay?: number;
+}): MaterialIconName {
   const conditionLower = condition.toLowerCase();
 
   // Clear, sunny
@@ -151,7 +163,13 @@ export function getWeatherIconByCondition(condition: string, isDay = 1): Materia
  * Get background gradient colors based on weather condition
  */
 
-export function getWeatherBackgroundColors(code: number, isNight: boolean): string[] {
+export function getWeatherBackgroundColors({
+  code,
+  isNight,
+}: {
+  code: number;
+  isNight: boolean;
+}): string[] {
   if (isNight) {
     // Night gradients
     if (code === 1000) return ['#1a2a3a', '#0c1824', '#05101a']; // Clear night
diff --git a/apps/expo/features/weather/lib/weatherService.ts b/apps/expo/features/weather/lib/weatherService.ts
index 284cc2dd57..897b0e7801 100644
--- a/apps/expo/features/weather/lib/weatherService.ts
+++ b/apps/expo/features/weather/lib/weatherService.ts
@@ -29,7 +29,13 @@ export async function searchLocations(query: string) {
 /**
  * Search for locations by coordinates
  */
-export async function searchLocationsByCoordinates(latitude: number, longitude: number) {
+export async function searchLocationsByCoordinates({
+  latitude,
+  longitude,
+}: {
+  latitude: number;
+  longitude: number;
+}) {
   const { data, error } = await apiClient.weather['search-by-coordinates'].get({
     query: { lat: latitude.toFixed(6), lon: longitude.toFixed(6) },
   });
@@ -99,7 +105,7 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) {
           hour12: true,
         }),
         temp: Math.round(hour.temp_f),
-        icon: getIconNameFromCode(hour.condition.code, hour.is_day) as string,
+        icon: getIconNameFromCode({ code: hour.condition.code, isDay: hour.is_day }) as string,
         weatherCode: hour.condition.code,
         isDay: hour.is_day,
       };
@@ -112,7 +118,7 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) {
       day: date.toLocaleDateString('en-US', { weekday: 'short' }),
       high: Math.round(day.day.maxtemp_f),
       low: Math.round(day.day.mintemp_f),
-      icon: getIconNameFromCode(day.day.condition.code, 1) as string, // Always use day icon for daily forecast
+      icon: getIconNameFromCode({ code: day.day.condition.code, isDay: 1 }) as string, // Always use day icon for daily forecast
       weatherCode: day.day.condition.code,
     };
   });
@@ -151,10 +157,13 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) {
 /**
  * Get background gradient colors based on weather condition
  */
-export function getWeatherBackgroundColors(
-  code: number,
-  isNight: boolean,
-): [string, string, string] {
+export function getWeatherBackgroundColors({
+  code,
+  isNight,
+}: {
+  code: number;
+  isNight: boolean;
+}): [string, string, string] {
   if (isNight) {
     if (code === 1000) return ['#1a2a3a', '#0c1824', '#05101a'];
     if (code >= 1003 && code <= 1009) return ['#2c3e50', '#1a2a3a', '#0c1824'];
diff --git a/apps/expo/features/weather/screens/LocationDetailScreen.tsx b/apps/expo/features/weather/screens/LocationDetailScreen.tsx
index 7fd6bf7319..2e046aa543 100644
--- a/apps/expo/features/weather/screens/LocationDetailScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationDetailScreen.tsx
@@ -48,7 +48,7 @@ export default function LocationDetailScreen() {
       if (location.details) {
         const weatherCode = location.details.weatherCode || 1000;
         const isNight = location.details.isDay === 0;
-        setGradientColors(getWeatherBackgroundColors(weatherCode, isNight));
+        setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight }));
       }
     }
   };
diff --git a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx b/apps/expo/features/weather/screens/LocationPreviewScreen.tsx
index b3ea514a48..264b66a00e 100644
--- a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationPreviewScreen.tsx
@@ -63,7 +63,7 @@ export default function LocationPreviewScreen() {
         if (formattedData.details) {
           const weatherCode = formattedData.details.weatherCode || 1000;
           const isNight = formattedData.details.isDay === 0;
-          setGradientColors(getWeatherBackgroundColors(weatherCode, isNight));
+          setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight }));
         }
       } else {
         setError(t('weather.failedToLoadWeather'));
diff --git a/apps/expo/features/weather/screens/LocationSearchScreen.tsx b/apps/expo/features/weather/screens/LocationSearchScreen.tsx
index 43822e5695..f0365f95a7 100644
--- a/apps/expo/features/weather/screens/LocationSearchScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationSearchScreen.tsx
@@ -212,7 +212,10 @@ export default function LocationSearchScreen() {
       ])) as Location.LocationObject;
 
       // Search for locations near coordinates
-      await searchByCoordinates(location.coords.latitude, location.coords.longitude);
+      await searchByCoordinates({
+        latitude: location.coords.latitude,
+        longitude: location.coords.longitude,
+      });
 
       // Clear search query since we're showing results based on coordinates
       setQuery('');
diff --git a/apps/expo/features/weather/screens/LocationsScreen.tsx b/apps/expo/features/weather/screens/LocationsScreen.tsx
index 1c48d033b2..0e3584c5b4 100644
--- a/apps/expo/features/weather/screens/LocationsScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationsScreen.tsx
@@ -251,4 +251,4 @@ function LocationsScreen() {
   );
 }
 
-export default withAuthWall(LocationsScreen, WeatherAuthWall);
+export default withAuthWall({ Component: LocationsScreen, AuthWall: WeatherAuthWall });
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
index 0dc6794346..d9095e00ac 100644
--- a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
+++ b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
@@ -10,7 +10,7 @@ import type { IdentificationResult } from '../types';
 const isIdentifyResponse = zodGuard(z.object({ results: z.array(z.unknown()) }));
 
 async function identifyOnline(selectedImage: SelectedImage): Promise<IdentificationResult[]> {
-  const image = await uploadImage(selectedImage.fileName, selectedImage.uri);
+  const image = await uploadImage({ fileName: selectedImage.fileName, uri: selectedImage.uri });
   if (!image) {
     throw new Error(
       `Couldn't upload image${selectedImage.fileName ? ` "${selectedImage.fileName}"` : ' (no filename provided)'}`,
diff --git a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx
index 2f0ef2bf00..e74bc56e6d 100644
--- a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx
+++ b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx
@@ -9,10 +9,13 @@ import { Keyboard } from 'react-native';
  * @param options - Optional configuration
  * @param options.enabled - Whether the hook should be active (default: true)
  */
-export function useKeyboardHideBlur(
-  textInputRef: React.RefObject<{ blur?: () => void } | null>,
-  options?: { enabled?: boolean },
-) {
+export function useKeyboardHideBlur({
+  textInputRef,
+  options,
+}: {
+  textInputRef: React.RefObject<{ blur?: () => void } | null>;
+  options?: { enabled?: boolean };
+}) {
   const { enabled = true } = options ?? {};
 
   useEffect(() => {
diff --git a/apps/expo/lib/store.ts b/apps/expo/lib/store.ts
index a4bc2c6816..c8efdb1c1b 100644
--- a/apps/expo/lib/store.ts
+++ b/apps/expo/lib/store.ts
@@ -18,7 +18,13 @@ import { assertDefined } from '@packrat/guards';
  * // Use:
  * obs(packItemsStore, id).deleted.set(true);
  */
-export function obs<T>(store: Observable<Record<string, T>>, id: string): Observable<T> {
+export function obs<T>({
+  store,
+  id,
+}: {
+  store: Observable<Record<string, T>>;
+  id: string;
+}): Observable<T> {
   // safe-cast: Legend-State v3 uses JavaScript Proxy for deep reactive access via store[id];
   // TypeScript resolves store[id] to T rather than Observable<T>, so we bridge with a single cast.
   const observable = (store as unknown as Record<string, Observable<T>>)[id];
diff --git a/apps/expo/lib/utils/ImageCacheManager.ts b/apps/expo/lib/utils/ImageCacheManager.ts
index 210066b5b9..1945928ca0 100644
--- a/apps/expo/lib/utils/ImageCacheManager.ts
+++ b/apps/expo/lib/utils/ImageCacheManager.ts
@@ -40,7 +40,13 @@ export class ImageCacheManager {
    * Download and cache an image
    */
 
-  public async cacheRemoteImage(fileName: string, remoteUrl: string): Promise<string> {
+  public async cacheRemoteImage({
+    fileName,
+    remoteUrl,
+  }: {
+    fileName: string;
+    remoteUrl: string;
+  }): Promise<string> {
     await this.initCacheDirectory();
 
     const localUri = `${this.cacheDirectory}${fileName}`;
@@ -65,7 +71,13 @@ export class ImageCacheManager {
     return localUri;
   }
 
-  public async cacheLocalTempImage(tempImageUri: string, fileName: string): Promise<void> {
+  public async cacheLocalTempImage({
+    tempImageUri,
+    fileName,
+  }: {
+    tempImageUri: string;
+    fileName: string;
+  }): Promise<void> {
     await this.initCacheDirectory();
 
     const localUri = `${this.cacheDirectory}${fileName}`;
diff --git a/apps/expo/lib/utils/ImageCacheManager.web.ts b/apps/expo/lib/utils/ImageCacheManager.web.ts
index 3e71cdcaf9..c6f1a765c8 100644
--- a/apps/expo/lib/utils/ImageCacheManager.web.ts
+++ b/apps/expo/lib/utils/ImageCacheManager.web.ts
@@ -12,11 +12,16 @@ class WebImageCacheManager {
     return null;
   }
 
-  public async cacheRemoteImage(_fileName: string, remoteUrl: string): Promise<string> {
+  public async cacheRemoteImage({
+    remoteUrl,
+  }: {
+    fileName: string;
+    remoteUrl: string;
+  }): Promise<string> {
     return remoteUrl;
   }
 
-  public async cacheLocalTempImage(_tempImageUri: string, _fileName: string): Promise<void> {}
+  public async cacheLocalTempImage(_: { tempImageUri: string; fileName: string }): Promise<void> {}
 
   public async clearImage(_fileName: string): Promise<void> {}
 
diff --git a/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts b/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts
index bc783211a6..2a794dfd3f 100644
--- a/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts
+++ b/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts
@@ -111,7 +111,10 @@ describe('ImageCacheManager', () => {
         .mockResolvedValueOnce({ exists: false } as any); // file exists check
       vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 200 } as any);
 
-      const result = await manager.cacheRemoteImage('test.jpg', 'https://example.com/test.jpg');
+      const result = await manager.cacheRemoteImage({
+        fileName: 'test.jpg',
+        remoteUrl: 'https://example.com/test.jpg',
+      });
 
       expect(FileSystem.downloadAsync).toHaveBeenCalledWith(
         'https://example.com/test.jpg',
@@ -131,7 +134,10 @@ describe('ImageCacheManager', () => {
         .mockResolvedValueOnce({ exists: true } as any) // initCacheDirectory check
         .mockResolvedValueOnce({ exists: true } as any); // file exists check
 
-      const result = await manager.cacheRemoteImage('cached.jpg', 'https://example.com/cached.jpg');
+      const result = await manager.cacheRemoteImage({
+        fileName: 'cached.jpg',
+        remoteUrl: 'https://example.com/cached.jpg',
+      });
 
       expect(FileSystem.downloadAsync).not.toHaveBeenCalled();
       expect(result).toBe('/mock/documents/images/cached.jpg');
@@ -144,7 +150,10 @@ describe('ImageCacheManager', () => {
       vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 404 } as any);
 
       await expect(
-        manager.cacheRemoteImage('fail.jpg', 'https://example.com/fail.jpg'),
+        manager.cacheRemoteImage({
+          fileName: 'fail.jpg',
+          remoteUrl: 'https://example.com/fail.jpg',
+        }),
       ).rejects.toThrow('Failed to download image: 404');
     });
 
@@ -154,7 +163,10 @@ describe('ImageCacheManager', () => {
         .mockResolvedValueOnce({ exists: false } as any);
       vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 200 } as any);
 
-      await manager.cacheRemoteImage('test.jpg', 'https://example.com/test.jpg');
+      await manager.cacheRemoteImage({
+        fileName: 'test.jpg',
+        remoteUrl: 'https://example.com/test.jpg',
+      });
 
       expect(FileSystem.makeDirectoryAsync).toHaveBeenCalled();
     });
@@ -167,7 +179,7 @@ describe('ImageCacheManager', () => {
     it('moves temp image to cache', async () => {
       vi.mocked(FileSystem.getInfoAsync).mockResolvedValue({ exists: true } as any);
 
-      await manager.cacheLocalTempImage('/tmp/temp.jpg', 'final.jpg');
+      await manager.cacheLocalTempImage({ tempImageUri: '/tmp/temp.jpg', fileName: 'final.jpg' });
 
       expect(FileSystem.moveAsync).toHaveBeenCalledWith({
         from: '/tmp/temp.jpg',
@@ -178,7 +190,7 @@ describe('ImageCacheManager', () => {
     it('initializes cache directory before move', async () => {
       vi.mocked(FileSystem.getInfoAsync).mockResolvedValue({ exists: false } as any);
 
-      await manager.cacheLocalTempImage('/tmp/temp.jpg', 'final.jpg');
+      await manager.cacheLocalTempImage({ tempImageUri: '/tmp/temp.jpg', fileName: 'final.jpg' });
 
       expect(FileSystem.makeDirectoryAsync).toHaveBeenCalled();
       expect(FileSystem.moveAsync).toHaveBeenCalled();
diff --git a/apps/expo/lib/utils/__tests__/compute-pack.test.ts b/apps/expo/lib/utils/__tests__/compute-pack.test.ts
index 811605c56d..9816b22cfe 100644
--- a/apps/expo/lib/utils/__tests__/compute-pack.test.ts
+++ b/apps/expo/lib/utils/__tests__/compute-pack.test.ts
@@ -60,7 +60,7 @@ function makePack(items: PackItem[] = [], overrides: Partial<PackWithItems> = {}
 // ---------------------------------------------------------------------------
 describe('computePackWeights', () => {
   it('returns zero base and total weight for a pack with no items', () => {
-    const result = computePackWeights(makePack([]));
+    const result = computePackWeights({ pack: makePack([]) });
     expect(result.baseWeight).toBe(0);
     expect(result.totalWeight).toBe(0);
   });
@@ -69,7 +69,7 @@ describe('computePackWeights', () => {
     const pack = makePack();
     // Force missing items
     (pack as unknown as { items: undefined }).items = undefined;
-    expect(() => computePackWeights(pack)).toThrow('Pack with ID pack-1 has no items');
+    expect(() => computePackWeights({ pack })).toThrow('Pack with ID pack-1 has no items');
   });
 
   it('calculates correct base and total weight in grams', () => {
@@ -77,7 +77,7 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g' }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack(items));
+    const result = computePackWeights({ pack: makePack(items) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(300);
   });
@@ -87,7 +87,7 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', consumable: true }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack(items));
+    const result = computePackWeights({ pack: makePack(items) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(100);
   });
@@ -97,14 +97,14 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', worn: true }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack(items));
+    const result = computePackWeights({ pack: makePack(items) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(100);
   });
 
   it('multiplies weight by item quantity', () => {
     const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 3 })];
-    const result = computePackWeights(makePack(items));
+    const result = computePackWeights({ pack: makePack(items) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(300);
   });
@@ -114,33 +114,33 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 1, weightUnit: 'kg' }), // 1000 g
       makePackItem({ id: 'i2', weight: 1000, weightUnit: 'g' }), // 1000 g
     ];
-    const result = computePackWeights(makePack(items));
+    const result = computePackWeights({ pack: makePack(items) });
     expect(result.totalWeight).toBe(2000);
     expect(result.baseWeight).toBe(2000);
   });
 
   it('respects the preferredUnit parameter (oz)', () => {
     const items = [makePackItem({ weight: 28.35, weightUnit: 'g' })];
-    const result = computePackWeights(makePack(items), 'oz');
+    const result = computePackWeights({ pack: makePack(items), preferredUnit: 'oz' });
     expect(result.totalWeight).toBeCloseTo(1, 1);
   });
 
   it('respects the preferredUnit parameter (kg)', () => {
     const items = [makePackItem({ weight: 1000, weightUnit: 'g' })];
-    const result = computePackWeights(makePack(items), 'kg');
+    const result = computePackWeights({ pack: makePack(items), preferredUnit: 'kg' });
     expect(result.totalWeight).toBe(1);
   });
 
   it('preserves all other pack properties', () => {
     const pack = makePack([], { name: 'My Pack', category: 'backpacking' });
-    const result = computePackWeights(pack);
+    const result = computePackWeights({ pack });
     expect(result.name).toBe('My Pack');
     expect(result.category).toBe('backpacking');
   });
 
   it('rounds computed weights to 2 decimal places', () => {
     const items = [makePackItem({ weight: 100, weightUnit: 'g' })];
-    const result = computePackWeights(makePack(items), 'oz');
+    const result = computePackWeights({ pack: makePack(items), preferredUnit: 'oz' });
     const decimals = result.totalWeight?.toString().split('.')[1];
     expect(decimals === undefined || decimals.length <= 2).toBe(true);
   });
@@ -151,7 +151,7 @@ describe('computePackWeights', () => {
 // ---------------------------------------------------------------------------
 describe('computePacksWeights', () => {
   it('returns an empty array when given no packs', () => {
-    expect(computePacksWeights([])).toEqual([]);
+    expect(computePacksWeights({ packs: [] })).toEqual([]);
   });
 
   it('computes weights for multiple packs', () => {
@@ -159,7 +159,7 @@ describe('computePacksWeights', () => {
       makePack([makePackItem({ weight: 500, weightUnit: 'g' })], { id: 'p1' }),
       makePack([makePackItem({ weight: 1000, weightUnit: 'g' })], { id: 'p2' }),
     ];
-    const results = computePacksWeights(packs);
+    const results = computePacksWeights({ packs });
     expect(results[0]?.totalWeight).toBe(500);
     expect(results[1]?.totalWeight).toBe(1000);
   });
diff --git a/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts b/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts
index f4cd6edf31..3d7127e1e9 100644
--- a/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts
+++ b/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts
@@ -13,70 +13,70 @@ describe('getRelativeTime', () => {
   it('returns "Just now" for very recent timestamps (< 1 minute ago)', () => {
     vi.setSystemTime(new Date('2024-01-01T12:00:30Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('Just now');
   });
 
   it('returns minutes ago for timestamps 1-59 minutes old', () => {
     vi.setSystemTime(new Date('2024-01-01T12:05:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('5 minutes ago');
   });
 
   it('returns "1 minute ago" (singular) for exactly 1 minute', () => {
     vi.setSystemTime(new Date('2024-01-01T12:01:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('1 minute ago');
   });
 
   it('returns hours ago for timestamps 1-23 hours old', () => {
     vi.setSystemTime(new Date('2024-01-01T15:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('3 hours ago');
   });
 
   it('returns "1 hour ago" (singular) for exactly 1 hour', () => {
     vi.setSystemTime(new Date('2024-01-01T13:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('1 hour ago');
   });
 
   it('returns days ago for timestamps 1-6 days old', () => {
     vi.setSystemTime(new Date('2024-01-04T12:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('3 days ago');
   });
 
   it('returns "1 day ago" (singular) for exactly 1 day', () => {
     vi.setSystemTime(new Date('2024-01-02T12:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('1 day ago');
   });
 
   it('returns weeks ago for timestamps 1-3 weeks old', () => {
     vi.setSystemTime(new Date('2024-01-15T12:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('2 weeks ago');
   });
 
   it('returns months ago for timestamps more than 30 days old', () => {
     vi.setSystemTime(new Date('2024-03-01T12:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('2 months ago');
   });
 
   it('returns "1 month ago" (singular) for exactly 1 month (30 days)', () => {
     vi.setSystemTime(new Date('2024-02-01T12:00:00Z'));
 
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('1 month ago');
   });
 
@@ -84,7 +84,7 @@ describe('getRelativeTime', () => {
     vi.setSystemTime(new Date('2024-01-01T12:00:00Z'));
 
     // Timestamp is in the future relative to the mocked "now"
-    const result = getRelativeTime('2024-01-01T13:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T13:00:00Z' });
     expect(result).toBe('Just now');
   });
 
@@ -92,7 +92,7 @@ describe('getRelativeTime', () => {
     vi.setSystemTime(new Date('2025-01-01T12:00:00Z'));
 
     // 12 months = 12 × 2592000 s; function has no year bucket
-    const result = getRelativeTime('2024-01-01T12:00:00Z');
+    const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' });
     expect(result).toBe('12 months ago');
   });
 });
diff --git a/apps/expo/lib/utils/__tests__/imageUtils.test.ts b/apps/expo/lib/utils/__tests__/imageUtils.test.ts
index 9d6a569edb..f4ae871a12 100644
--- a/apps/expo/lib/utils/__tests__/imageUtils.test.ts
+++ b/apps/expo/lib/utils/__tests__/imageUtils.test.ts
@@ -236,7 +236,7 @@ describe('imageUtils', () => {
 
   describe('getImageExtension', () => {
     it('should return inferred extension immediately if available', async () => {
-      const result = await getImageExtension('https://example.com/image.jpg');
+      const result = await getImageExtension({ url: 'https://example.com/image.jpg' });
       expect(result).toBe('jpg');
       expect(global.fetch).not.toHaveBeenCalled();
     });
@@ -255,7 +255,7 @@ describe('imageUtils', () => {
         },
       } as unknown as Response);
 
-      const result = await getImageExtension('https://example.com/image');
+      const result = await getImageExtension({ url: 'https://example.com/image' });
       expect(result).toBe('jpg');
       expect(mockFetch).toHaveBeenCalled();
     });
@@ -269,7 +269,10 @@ describe('imageUtils', () => {
       const mockFetch = global.fetch as MockedFunction<typeof fetch>;
       mockFetch.mockRejectedValue(new Error('Network error'));
 
-      const result = await getImageExtension('https://example.com/image', 'png');
+      const result = await getImageExtension({
+        url: 'https://example.com/image',
+        defaultExt: 'png',
+      });
       expect(result).toBe('png');
     });
 
@@ -282,7 +285,10 @@ describe('imageUtils', () => {
       const mockFetch = global.fetch as MockedFunction<typeof fetch>;
       mockFetch.mockRejectedValue(new Error('Network error'));
 
-      const result = await getImageExtension('https://example.com/image', 'webp');
+      const result = await getImageExtension({
+        url: 'https://example.com/image',
+        defaultExt: 'webp',
+      });
       expect(result).toBe('webp');
     });
 
@@ -300,7 +306,10 @@ describe('imageUtils', () => {
         });
       });
 
-      const result = await getImageExtension('https://example.com/image', 'gif');
+      const result = await getImageExtension({
+        url: 'https://example.com/image',
+        defaultExt: 'gif',
+      });
       expect(result).toBe('gif');
     }, 10000);
 
@@ -318,7 +327,10 @@ describe('imageUtils', () => {
         },
       } as unknown as Response);
 
-      const result = await getImageExtension('https://example.com/image', 'jpg');
+      const result = await getImageExtension({
+        url: 'https://example.com/image',
+        defaultExt: 'jpg',
+      });
       expect(result).toBe('webp'); // Should return fetched, not default
     });
   });
diff --git a/apps/expo/lib/utils/compute-pack.ts b/apps/expo/lib/utils/compute-pack.ts
index 28b81d97df..a2428a8a42 100644
--- a/apps/expo/lib/utils/compute-pack.ts
+++ b/apps/expo/lib/utils/compute-pack.ts
@@ -7,10 +7,13 @@ export type ComputedPack = PackWithItems & {
   totalWeight: number;
 };
 
-export const computePackWeights = (
-  pack: PackWithItems,
-  preferredUnit: WeightUnit = 'g',
-): ComputedPack => {
+export const computePackWeights = ({
+  pack,
+  preferredUnit = 'g',
+}: {
+  pack: PackWithItems;
+  preferredUnit?: WeightUnit;
+}): ComputedPack => {
   if (!pack.items) {
     throw new Error(`Pack with ID ${pack.id} has no items`);
   }
@@ -20,7 +23,8 @@ export const computePackWeights = (
 
   for (const item of pack.items) {
     const itemWeightInGrams =
-      normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
     totalWeightGrams += itemWeightInGrams;
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
@@ -29,12 +33,15 @@ export const computePackWeights = (
 
   return {
     ...pack,
-    baseWeight: displayWeight(baseWeightGrams, preferredUnit),
-    totalWeight: displayWeight(totalWeightGrams, preferredUnit),
+    baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }),
+    totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }),
   };
 };
 
-export const computePacksWeights = (
-  packs: PackWithItems[],
-  preferredUnit: WeightUnit = 'g',
-): ComputedPack[] => packs.map((pack) => computePackWeights(pack, preferredUnit));
+export const computePacksWeights = ({
+  packs,
+  preferredUnit = 'g',
+}: {
+  packs: PackWithItems[];
+  preferredUnit?: WeightUnit;
+}): ComputedPack[] => packs.map((pack) => computePackWeights({ pack, preferredUnit }));
diff --git a/apps/expo/lib/utils/getRelativeTime.ts b/apps/expo/lib/utils/getRelativeTime.ts
index d77644a356..6ed2002e1b 100644
--- a/apps/expo/lib/utils/getRelativeTime.ts
+++ b/apps/expo/lib/utils/getRelativeTime.ts
@@ -16,10 +16,13 @@ function toDate(value: Date | string | null | undefined): Date | null {
   return Number.isNaN(d.getTime()) ? null : d;
 }
 
-export function getRelativeTime(
-  dateValue: Date | string | null | undefined,
-  t?: TranslationFunction,
-): string {
+export function getRelativeTime({
+  dateValue,
+  t,
+}: {
+  dateValue: Date | string | null | undefined;
+  t?: TranslationFunction;
+}): string {
   // i18next resolves pluralization via _one/_other suffixes at runtime.
   // The base keys (e.g. 'common.timeAgo.months') are not in en.json as literals,
   // so a loose cast is needed for dynamic key construction.
diff --git a/apps/expo/lib/utils/imageUtils.ts b/apps/expo/lib/utils/imageUtils.ts
index 44cf97dbcd..3fc5ed835d 100644
--- a/apps/expo/lib/utils/imageUtils.ts
+++ b/apps/expo/lib/utils/imageUtils.ts
@@ -126,7 +126,13 @@ export const fetchImageExtension = async (url: string): Promise<string | null> =
  * @returns A promise resolving to the extension
  */
 
-export const getImageExtension = async (url: string, defaultExt = 'jpg'): Promise<string> => {
+export const getImageExtension = async ({
+  url,
+  defaultExt = 'jpg',
+}: {
+  url: string;
+  defaultExt?: string;
+}): Promise<string> => {
   // First check if URL already has an extension
   const inferredExt = inferImageExtension(url);
   if (inferredExt) return inferredExt;
diff --git a/apps/expo/utils/__tests__/chatContextHelpers.test.ts b/apps/expo/utils/__tests__/chatContextHelpers.test.ts
index f3d2db77ba..b16382b98e 100644
--- a/apps/expo/utils/__tests__/chatContextHelpers.test.ts
+++ b/apps/expo/utils/__tests__/chatContextHelpers.test.ts
@@ -7,28 +7,39 @@ import {
 
 describe('generatePromptWithContext', () => {
   it('returns the raw message when no context is provided', () => {
-    expect(generatePromptWithContext('Hello')).toBe('Hello');
+    expect(generatePromptWithContext({ userMessage: 'Hello' })).toBe('Hello');
   });
 
   it('returns the raw message for a general context', () => {
-    expect(generatePromptWithContext('Hello', { contextType: 'general' })).toBe('Hello');
+    expect(
+      generatePromptWithContext({ userMessage: 'Hello', context: { contextType: 'general' } }),
+    ).toBe('Hello');
   });
 
   it('prefixes message with item name for item context', () => {
-    const result = generatePromptWithContext('Tell me more', {
-      contextType: 'item',
-      itemName: 'Tent',
+    const result = generatePromptWithContext({
+      userMessage: 'Tell me more',
+      context: {
+        contextType: 'item',
+        itemName: 'Tent',
+      },
     });
     expect(result).toBe('[About item: Tent] Tell me more');
   });
 
   it('returns raw message for item context without an item name', () => {
-    const result = generatePromptWithContext('Tell me more', { contextType: 'item' });
+    const result = generatePromptWithContext({
+      userMessage: 'Tell me more',
+      context: { contextType: 'item' },
+    });
     expect(result).toBe('Tell me more');
   });
 
   it('prefixes message for pack context', () => {
-    const result = generatePromptWithContext('Analyze my pack', { contextType: 'pack' });
+    const result = generatePromptWithContext({
+      userMessage: 'Analyze my pack',
+      context: { contextType: 'pack' },
+    });
     expect(result).toBe('[About my pack] Analyze my pack');
   });
 });
diff --git a/apps/expo/utils/__tests__/weight.test.ts b/apps/expo/utils/__tests__/weight.test.ts
index 2e4c05b762..36d2cfbc19 100644
--- a/apps/expo/utils/__tests__/weight.test.ts
+++ b/apps/expo/utils/__tests__/weight.test.ts
@@ -36,34 +36,37 @@ function makeItem(
 // ---------------------------------------------------------------------------
 describe('convertWeight', () => {
   it('returns the same value when from === to', () => {
-    expect(convertWeight(100, { from: 'g', to: 'g' })).toBe(100);
-    expect(convertWeight(5, { from: 'oz', to: 'oz' })).toBe(5);
-    expect(convertWeight(2, { from: 'kg', to: 'kg' })).toBe(2);
-    expect(convertWeight(1, { from: 'lb', to: 'lb' })).toBe(1);
+    expect(convertWeight({ weight: 100, units: { from: 'g', to: 'g' } })).toBe(100);
+    expect(convertWeight({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5);
+    expect(convertWeight({ weight: 2, units: { from: 'kg', to: 'kg' } })).toBe(2);
+    expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'lb' } })).toBe(1);
   });
 
   it('converts grams to ounces', () => {
-    expect(convertWeight(100, { from: 'g', to: 'oz' })).toBeCloseTo(3.53, 1);
+    expect(convertWeight({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo(3.53, 1);
   });
 
   it('converts ounces to grams', () => {
-    expect(convertWeight(1, { from: 'oz', to: 'g' })).toBeCloseTo(28.349523125, 8);
+    expect(convertWeight({ weight: 1, units: { from: 'oz', to: 'g' } })).toBeCloseTo(
+      28.349523125,
+      8,
+    );
   });
 
   it('converts grams to kilograms', () => {
-    expect(convertWeight(1000, { from: 'g', to: 'kg' })).toBe(1);
+    expect(convertWeight({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1);
   });
 
   it('converts kilograms to grams', () => {
-    expect(convertWeight(1, { from: 'kg', to: 'g' })).toBe(1000);
+    expect(convertWeight({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000);
   });
 
   it('converts grams to pounds', () => {
-    expect(convertWeight(453.59, { from: 'g', to: 'lb' })).toBeCloseTo(1, 1);
+    expect(convertWeight({ weight: 453.59, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 1);
   });
 
   it('converts pounds to grams', () => {
-    expect(convertWeight(1, { from: 'lb', to: 'g' })).toBeCloseTo(453.59237, 4);
+    expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'g' } })).toBeCloseTo(453.59237, 4);
   });
 });
 
@@ -72,9 +75,9 @@ describe('convertWeight', () => {
 // ---------------------------------------------------------------------------
 describe('formatWeight', () => {
   it('formats weight with unit suffix', () => {
-    expect(formatWeight(100, 'g')).toBe('100g');
-    expect(formatWeight(3.5, 'oz')).toBe('3.5oz');
-    expect(formatWeight(0, 'kg')).toBe('0kg');
+    expect(formatWeight({ weight: 100, unit: 'g' })).toBe('100g');
+    expect(formatWeight({ weight: 3.5, unit: 'oz' })).toBe('3.5oz');
+    expect(formatWeight({ weight: 0, unit: 'kg' })).toBe('0kg');
   });
 });
 
@@ -83,12 +86,12 @@ describe('formatWeight', () => {
 // ---------------------------------------------------------------------------
 describe('calculateBaseWeight', () => {
   it('returns 0 for an empty item list', () => {
-    expect(calculateBaseWeight([])).toBe(0);
+    expect(calculateBaseWeight({ items: [] })).toBe(0);
   });
 
   it('sums non-consumable, non-worn items', () => {
     const items = [makeItem({ weight: 200, weightUnit: 'g' })];
-    expect(calculateBaseWeight(items, 'g')).toBe(200);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(200);
   });
 
   it('excludes consumable items from base weight', () => {
@@ -96,7 +99,7 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(100);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100);
   });
 
   it('excludes worn items from base weight', () => {
@@ -104,12 +107,12 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', worn: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(100);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100);
   });
 
   it('accounts for item quantity', () => {
     const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 3 })];
-    expect(calculateBaseWeight(items, 'g')).toBe(300);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('returns 0 when all items are consumable or worn', () => {
@@ -117,7 +120,7 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g', worn: true }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(0);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(0);
   });
 });
 
@@ -126,7 +129,7 @@ describe('calculateBaseWeight', () => {
 // ---------------------------------------------------------------------------
 describe('calculateTotalWeight', () => {
   it('returns 0 for an empty item list', () => {
-    expect(calculateTotalWeight([])).toBe(0);
+    expect(calculateTotalWeight({ items: [] })).toBe(0);
   });
 
   it('includes consumable items in total weight', () => {
@@ -134,7 +137,7 @@ describe('calculateTotalWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(300);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('includes worn items in total weight', () => {
@@ -142,7 +145,7 @@ describe('calculateTotalWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', worn: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(300);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('converts mixed weight units correctly', () => {
@@ -150,11 +153,11 @@ describe('calculateTotalWeight', () => {
       makeItem({ id: 'i1', weight: 1000, weightUnit: 'g' }),
       makeItem({ id: 'i2', weight: 1, weightUnit: 'kg' }),
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(2000);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(2000);
   });
 
   it('accounts for item quantity', () => {
     const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 5 })];
-    expect(calculateTotalWeight(items, 'g')).toBe(500);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(500);
   });
 });
diff --git a/apps/expo/utils/chatContextHelpers.ts b/apps/expo/utils/chatContextHelpers.ts
index 74aee49b9c..646879b985 100644
--- a/apps/expo/utils/chatContextHelpers.ts
+++ b/apps/expo/utils/chatContextHelpers.ts
@@ -6,7 +6,13 @@ type ChatContext = {
   contextType: 'item' | 'pack' | 'general';
 };
 
-export function generatePromptWithContext(userMessage: string, context?: ChatContext): string {
+export function generatePromptWithContext({
+  userMessage,
+  context,
+}: {
+  userMessage: string;
+  context?: ChatContext;
+}): string {
   if (!context || context.contextType === 'general') {
     return userMessage;
   }
diff --git a/apps/expo/utils/weight.ts b/apps/expo/utils/weight.ts
index c790dce53d..916c6020e9 100644
--- a/apps/expo/utils/weight.ts
+++ b/apps/expo/utils/weight.ts
@@ -4,24 +4,41 @@ import { convert, displayWeight, normalize, parseWeightUnit } from '@packrat/uni
 
 export { convert as convertWeight };
 
-export const formatWeight = (weight: number, unit: WeightUnit): string => `${weight}${unit}`;
+export const formatWeight = ({ weight, unit }: { weight: number; unit: WeightUnit }): string =>
+  `${weight}${unit}`;
 
-export const calculateBaseWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => {
+export const calculateBaseWeight = ({
+  items,
+  unit = 'g',
+}: {
+  items: PackItem[];
+  unit?: WeightUnit;
+}): number => {
   const grams = items
     .filter((item) => !item.consumable && !item.worn)
     .reduce(
       (total, item) =>
-        total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity,
+        total +
+        normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+          item.quantity,
       0,
     );
-  return displayWeight(grams, unit);
+  return displayWeight({ grams, unit });
 };
 
-export const calculateTotalWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => {
+export const calculateTotalWeight = ({
+  items,
+  unit = 'g',
+}: {
+  items: PackItem[];
+  unit?: WeightUnit;
+}): number => {
   const grams = items.reduce(
     (total, item) =>
-      total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity,
+      total +
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+        item.quantity,
     0,
   );
-  return displayWeight(grams, unit);
+  return displayWeight({ grams, unit });
 };
diff --git a/apps/guides/app/api/dev/generate-batch/route.ts b/apps/guides/app/api/dev/generate-batch/route.ts
index d4b8dc08b5..f54a1dfb55 100644
--- a/apps/guides/app/api/dev/generate-batch/route.ts
+++ b/apps/guides/app/api/dev/generate-batch/route.ts
@@ -33,7 +33,7 @@ export async function POST(request: Request) {
     }
 
     // Generate the posts
-    const filePaths = await generatePosts(count, requestData.categories);
+    const filePaths = await generatePosts({ count, categories: requestData.categories });
 
     if (!filePaths.length) {
       throw new Error('Failed to generate posts');
diff --git a/apps/guides/app/api/dev/generate-post/route.ts b/apps/guides/app/api/dev/generate-post/route.ts
index a07a951dcd..dc234d57fe 100644
--- a/apps/guides/app/api/dev/generate-post/route.ts
+++ b/apps/guides/app/api/dev/generate-post/route.ts
@@ -39,7 +39,7 @@ export async function POST(request: Request) {
     }
 
     // Generate the post
-    const filePath = await generatePost(requestData);
+    const filePath = await generatePost({ request: requestData });
 
     if (!filePath) {
       throw new Error('Failed to generate post');
diff --git a/apps/guides/app/guide/[slug]/page.tsx b/apps/guides/app/guide/[slug]/page.tsx
index 1e672ecf0d..b36c44bc65 100644
--- a/apps/guides/app/guide/[slug]/page.tsx
+++ b/apps/guides/app/guide/[slug]/page.tsx
@@ -64,7 +64,7 @@ export default async function GuidePage({ params }: { params: Promise<{ slug: st
   const content = getMdxContent(slug);
 
   // Get related posts
-  const relatedPosts = getRelatedPosts(post, 3);
+  const relatedPosts = getRelatedPosts({ post, count: 3 });
 
   return (
     <div>
diff --git a/apps/guides/lib/enhanceGuideContent.ts b/apps/guides/lib/enhanceGuideContent.ts
index 87f114efa3..0e4dbc3876 100644
--- a/apps/guides/lib/enhanceGuideContent.ts
+++ b/apps/guides/lib/enhanceGuideContent.ts
@@ -38,10 +38,13 @@ export interface EnhancedContentResult {
  * This is the main programmatic API for content enhancement
  */
 
-export async function enhanceGuideContent(
-  content: string,
-  options: ContentEnhancementOptions = {},
-): Promise<EnhancedContentResult> {
+export async function enhanceGuideContent({
+  content,
+  options = {},
+}: {
+  content: string;
+  options?: ContentEnhancementOptions;
+}): Promise<EnhancedContentResult> {
   const {
     temperature = 0.3,
     maxSearchResults = 5,
@@ -186,16 +189,19 @@ export async function enhanceGuideContent(
  * Batch enhance multiple content pieces
  */
 
-export async function batchEnhanceContent(
-  contentPieces: Array<{ id: string; content: string }>,
-  options: ContentEnhancementOptions = {},
-): Promise<Array<{ id: string; result: EnhancedContentResult }>> {
+export async function batchEnhanceContent({
+  contentPieces,
+  options = {},
+}: {
+  contentPieces: Array<{ id: string; content: string }>;
+  options?: ContentEnhancementOptions;
+}): Promise<Array<{ id: string; result: EnhancedContentResult }>> {
   const results: Array<{ id: string; result: EnhancedContentResult }> = [];
 
   for (const piece of contentPieces) {
     try {
       console.log(`🔄 Enhancing content piece: ${piece.id}`);
-      const result = await enhanceGuideContent(piece.content, options);
+      const result = await enhanceGuideContent({ content: piece.content, options });
       results.push({ id: piece.id, result });
 
       // Add delay between requests to avoid rate limiting
diff --git a/apps/guides/lib/mdx-static.ts b/apps/guides/lib/mdx-static.ts
index 8b9f474c76..224087d753 100644
--- a/apps/guides/lib/mdx-static.ts
+++ b/apps/guides/lib/mdx-static.ts
@@ -14,7 +14,7 @@ export function getMdxContent(slug: string): string {
   return postContent[slug] || `<p>Content not found for ${slug}</p>`;
 }
 
-export function getRelatedPosts(post: Post, count = 3): Post[] {
+export function getRelatedPosts({ post, count = 3 }: { post: Post; count?: number }): Post[] {
   // Filter out the current post
   const otherPosts = posts.filter((p) => p.slug !== post.slug);
 
diff --git a/apps/guides/scripts/enhance-content.ts b/apps/guides/scripts/enhance-content.ts
index 04f4da387d..d856e419b1 100644
--- a/apps/guides/scripts/enhance-content.ts
+++ b/apps/guides/scripts/enhance-content.ts
@@ -139,10 +139,13 @@ function parseContentFile(filePath: string): {
  * Write enhanced content back to file
  */
 
-function writeEnhancedContent(
-  filePath: string,
-  opts: { metadata: Record<string, unknown>; enhancedContent: string },
-): void {
+function writeEnhancedContent({
+  filePath,
+  opts,
+}: {
+  filePath: string;
+  opts: { metadata: Record<string, unknown>; enhancedContent: string };
+}): void {
   const { metadata, enhancedContent } = opts;
   const newFileContent = matter.stringify(enhancedContent, metadata);
   fs.writeFileSync(filePath, newFileContent, 'utf8');
@@ -152,10 +155,13 @@ function writeEnhancedContent(
  * Enhance a single content file
  */
 
-async function enhanceFile(
-  filePath: string,
-  opts: { cliOptions: CliOptions; enhancementOptions: ContentEnhancementOptions },
-): Promise<{
+async function enhanceFile({
+  filePath,
+  opts,
+}: {
+  filePath: string;
+  opts: { cliOptions: CliOptions; enhancementOptions: ContentEnhancementOptions };
+}): Promise<{
   enhanced: boolean;
   productsAdded: number;
   error?: string;
@@ -182,7 +188,7 @@ async function enhanceFile(
     console.log(chalk.blue(`🔄 Enhancing: ${fileName}`));
 
     // Enhance the content
-    const result = await enhanceGuideContent(content, enhancementOptions);
+    const result = await enhanceGuideContent({ content, options: enhancementOptions });
 
     // Check if enhancement actually added value
     if (result.productsUsed.length === 0) {
@@ -213,7 +219,7 @@ async function enhanceFile(
     }
 
     // Write enhanced content
-    writeEnhancedContent(filePath, { metadata, enhancedContent: result.content });
+    writeEnhancedContent({ filePath, opts: { metadata, enhancedContent: result.content } });
 
     console.log(
       chalk.green(`  ✅ Enhanced ${fileName} with ${result.productsUsed.length} product links`),
@@ -283,7 +289,7 @@ async function enhanceContent(cliOptions: CliOptions): Promise<void> {
   for (const filePath of filesToProcess) {
     stats.processed++;
 
-    const result = await enhanceFile(filePath, { cliOptions, enhancementOptions });
+    const result = await enhanceFile({ filePath, opts: { cliOptions, enhancementOptions } });
 
     if (result.error) {
       stats.errors++;
diff --git a/apps/guides/scripts/generate-content.ts b/apps/guides/scripts/generate-content.ts
index adbdad28fa..f43a57b881 100644
--- a/apps/guides/scripts/generate-content.ts
+++ b/apps/guides/scripts/generate-content.ts
@@ -176,10 +176,13 @@ function getExistingContent(): ContentMetadata[] {
 }
 
 // Generate topic ideas based on categories and existing content
-async function generateTopicIdeas(
-  count: number,
-  opts: { categories?: ContentCategory[]; existingContent?: ContentMetadata[] } = {},
-): Promise<ContentMetadata[]> {
+async function generateTopicIdeas({
+  count,
+  opts = {},
+}: {
+  count: number;
+  opts?: { categories?: ContentCategory[]; existingContent?: ContentMetadata[] };
+}): Promise<ContentMetadata[]> {
   const { categories, existingContent = [] } = opts;
   console.log(chalk.blue(`Generating ${count} topic ideas...`));
 
@@ -300,10 +303,13 @@ async function generateTopicIdeas(
 }
 
 // Generate full MDX content for a topic with awareness of existing content
-async function generateMdxContent(
-  metadata: ContentMetadata,
-  existingContent: ContentMetadata[] = [],
-): Promise<string> {
+async function generateMdxContent({
+  metadata,
+  existingContent = [],
+}: {
+  metadata: ContentMetadata;
+  existingContent?: ContentMetadata[];
+}): Promise<string> {
   console.log(chalk.blue(`Generating content for: ${metadata.title}`));
 
   const categoryNames = metadata.categories.map((c) => CATEGORY_DISPLAY_NAMES[c]);
@@ -367,10 +373,13 @@ async function generateMdxContent(
 }
 
 // Generate a single post
-async function generatePost(
-  request: ContentRequest,
-  existingContent: ContentMetadata[] = [],
-): Promise<string> {
+async function generatePost({
+  request,
+  existingContent = [],
+}: {
+  request: ContentRequest;
+  existingContent?: ContentMetadata[];
+}): Promise<string> {
   try {
     // Set defaults for missing fields
     const metadata: ContentMetadata = {
@@ -388,11 +397,11 @@ async function generatePost(
     // Generate content if requested
     let content = '';
     if (request.generateFullContent) {
-      content = await generateMdxContent(metadata, existingContent);
+      content = await generateMdxContent({ metadata, existingContent });
 
       try {
         console.log(chalk.blue(`🔗 Enhancing ${metadata.title} with catalog items...`));
-        const enhancementResult = await enhanceGuideContent(content);
+        const enhancementResult = await enhanceGuideContent({ content });
         content = enhancementResult.content;
 
         if (enhancementResult.productsUsed.length > 0) {
@@ -426,14 +435,20 @@ async function generatePost(
 }
 
 // Generate multiple posts
-async function generatePosts(count: number, categories?: ContentCategory[]): Promise<string[]> {
+async function generatePosts({
+  count,
+  categories,
+}: {
+  count: number;
+  categories?: ContentCategory[];
+}): Promise<string[]> {
   try {
     // Get existing content first
     const existingContent = getExistingContent();
     console.log(chalk.blue(`Found ${existingContent.length} existing articles`));
 
     // Generate topic ideas with awareness of existing content
-    const topics = await generateTopicIdeas(count, { categories, existingContent });
+    const topics = await generateTopicIdeas({ count, opts: { categories, existingContent } });
     console.log(chalk.green(`✓ Generated ${topics.length} topic ideas`));
 
     // Generate content for each topic
@@ -453,7 +468,7 @@ async function generatePosts(count: number, categories?: ContentCategory[]): Pro
       };
 
       // Pass existing content to generatePost for context
-      const filePath = await generatePost(request, existingContent);
+      const filePath = await generatePost({ request, existingContent });
       if (filePath) {
         filePaths.push(filePath);
 
@@ -573,7 +588,7 @@ if (require.main === module) {
     );
   }
 
-  generatePosts(count, categoryArgs.length > 0 ? categoryArgs : undefined)
+  generatePosts({ count, categories: categoryArgs.length > 0 ? categoryArgs : undefined })
     .then(() => console.log(chalk.green('Generation complete!')))
     .catch((err) => console.error(chalk.red('Generation failed:'), err));
 }
diff --git a/apps/guides/scripts/update-authors.ts b/apps/guides/scripts/update-authors.ts
index 91e7021108..a7657cd8d0 100644
--- a/apps/guides/scripts/update-authors.ts
+++ b/apps/guides/scripts/update-authors.ts
@@ -57,7 +57,7 @@ function getAllPosts(): PostMetadata[] {
 }
 
 // Update author in a specific post
-function updatePostAuthor(post: PostMetadata, newAuthor: string): boolean {
+function updatePostAuthor({ post, newAuthor }: { post: PostMetadata; newAuthor: string }): boolean {
   try {
     const fileContent = fs.readFileSync(post.filePath, 'utf8');
     const { data, content } = matter(fileContent);
@@ -116,7 +116,7 @@ function listAvailableAuthors(): void {
 }
 
 // Update a specific post by slug
-function updatePostBySlug(slug: string, newAuthor: string): void {
+function updatePostBySlug({ slug, newAuthor }: { slug: string; newAuthor: string }): void {
   const posts = getAllPosts();
   const post = posts.find((p) => p.slug === slug);
 
@@ -129,7 +129,7 @@ function updatePostBySlug(slug: string, newAuthor: string): void {
     return;
   }
 
-  updatePostAuthor(post, newAuthor);
+  updatePostAuthor({ post, newAuthor });
 }
 
 // Find posts by title (fuzzy search)
@@ -141,7 +141,13 @@ function findPostsByTitle(searchTitle: string): PostMetadata[] {
 }
 
 // Update posts by title search
-function updatePostsByTitle(searchTitle: string, newAuthor: string): void {
+function updatePostsByTitle({
+  searchTitle,
+  newAuthor,
+}: {
+  searchTitle: string;
+  newAuthor: string;
+}): void {
   const matchingPosts = findPostsByTitle(searchTitle);
 
   if (matchingPosts.length === 0) {
@@ -160,11 +166,17 @@ function updatePostsByTitle(searchTitle: string, newAuthor: string): void {
 
   const post = matchingPosts[0];
   assertDefined(post);
-  updatePostAuthor(post, newAuthor);
+  updatePostAuthor({ post, newAuthor });
 }
 
 // Update all posts by current author name
-function updatePostsByAuthor(currentAuthor: string, newAuthor: string): void {
+function updatePostsByAuthor({
+  currentAuthor,
+  newAuthor,
+}: {
+  currentAuthor: string;
+  newAuthor: string;
+}): void {
   const posts = getAllPosts();
   const matchingPosts = posts.filter((post) => post.author === currentAuthor);
 
@@ -182,7 +194,7 @@ function updatePostsByAuthor(currentAuthor: string, newAuthor: string): void {
 
   let updatedCount = 0;
   for (const post of matchingPosts) {
-    if (updatePostAuthor(post, newAuthor)) {
+    if (updatePostAuthor({ post, newAuthor })) {
       updatedCount++;
     }
   }
@@ -265,7 +277,7 @@ function rebalanceAuthors(): void {
     );
 
     if (authorWithLeast !== post.author) {
-      if (updatePostAuthor(post, authorWithLeast)) {
+      if (updatePostAuthor({ post, newAuthor: authorWithLeast })) {
         authorCounts[authorWithLeast] = (authorCounts[authorWithLeast] ?? 0) + 1;
         updatedCount++;
       }
@@ -330,7 +342,7 @@ if (isMainModule()) {
         }
         assertDefined(args[1]);
         assertDefined(args[2]);
-        updatePostBySlug(args[1], args[2]);
+        updatePostBySlug({ slug: args[1], newAuthor: args[2] });
         break;
 
       case 'update-title':
@@ -342,7 +354,7 @@ if (isMainModule()) {
         }
         assertDefined(args[1]);
         assertDefined(args[2]);
-        updatePostsByTitle(args[1], args[2]);
+        updatePostsByTitle({ searchTitle: args[1], newAuthor: args[2] });
         break;
 
       case 'update-by-author':
@@ -356,7 +368,7 @@ if (isMainModule()) {
         }
         assertDefined(args[1]);
         assertDefined(args[2]);
-        updatePostsByAuthor(args[1], args[2]);
+        updatePostsByAuthor({ currentAuthor: args[1], newAuthor: args[2] });
         break;
 
       case 'find': {
diff --git a/apps/landing/components/main-nav.tsx b/apps/landing/components/main-nav.tsx
index 6eb1b2b01c..558fd54a25 100644
--- a/apps/landing/components/main-nav.tsx
+++ b/apps/landing/components/main-nav.tsx
@@ -40,7 +40,13 @@ export default function MainNav() {
     return () => window.removeEventListener('scroll', handleScroll);
   }, []);
 
-  const scrollToSection = (e: React.MouseEvent<HTMLAnchorElement>, href: string) => {
+  const scrollToSection = ({
+    e,
+    href,
+  }: {
+    e: React.MouseEvent<HTMLAnchorElement>;
+    href: string;
+  }) => {
     if (href.startsWith('http')) {
       e.preventDefault();
       window.open(href, '_blank', 'noopener,noreferrer');
@@ -83,7 +89,7 @@ export default function MainNav() {
               <Link
                 key={item.href}
                 href={item.href}
-                onClick={(e) => scrollToSection(e, item.href)}
+                onClick={(e) => scrollToSection({ e, href: item.href })}
                 className={cn(
                   'px-3 py-2 text-sm font-medium rounded-full hover:bg-black/5 dark:hover:bg-white/10 transition-colors',
                   activeSection === item.href
@@ -103,7 +109,7 @@ export default function MainNav() {
 
           <Link
             href={siteConfig.cta.primary.href}
-            onClick={(e) => scrollToSection(e, siteConfig.cta.primary.href)}
+            onClick={(e) => scrollToSection({ e, href: siteConfig.cta.primary.href })}
             className="hidden md:inline-flex items-center gap-1.5 ml-2 px-4 py-1.5 rounded-full bg-apple-blue text-white text-sm font-medium hover:bg-apple-blue/90 transition-colors"
           >
             {siteConfig.cta.primary.text}
@@ -142,7 +148,7 @@ export default function MainNav() {
                     <Link
                       key={item.href}
                       href={item.href}
-                      onClick={(e) => scrollToSection(e, item.href)}
+                      onClick={(e) => scrollToSection({ e, href: item.href })}
                       className={cn(
                         'px-3 py-2 text-base font-medium rounded-full hover:bg-black/5 dark:hover:bg-white/10 transition-colors',
                         activeSection === item.href ? 'text-apple-blue font-semibold' : '',
@@ -156,7 +162,7 @@ export default function MainNav() {
                 <div className="mt-auto mb-6">
                   <Link
                     href={siteConfig.cta.primary.href}
-                    onClick={(e) => scrollToSection(e, siteConfig.cta.primary.href)}
+                    onClick={(e) => scrollToSection({ e, href: siteConfig.cta.primary.href })}
                     className="flex items-center justify-center w-full px-4 py-2.5 rounded-full bg-apple-blue text-white text-sm font-medium hover:bg-apple-blue/90 transition-colors"
                   >
                     {siteConfig.cta.primary.text}
diff --git a/apps/landing/components/sections/landing-hero.tsx b/apps/landing/components/sections/landing-hero.tsx
index 255457eea5..82f8f4cb9f 100644
--- a/apps/landing/components/sections/landing-hero.tsx
+++ b/apps/landing/components/sections/landing-hero.tsx
@@ -1,9 +1,45 @@
+'use client';
+
+import { motion } from 'framer-motion';
 import DeviceMockup from 'landing-app/components/ui/device-mockup';
 import { siteConfig } from 'landing-app/config/site';
 import { ArrowRight, Download, Star } from 'lucide-react';
 import Link from 'next/link';
+import type React from 'react';
 
 export default function LandingHero() {
+  const scrollToSection = ({
+    e,
+    href,
+  }: {
+    e: React.MouseEvent<HTMLAnchorElement>;
+    href: string;
+  }) => {
+    e.preventDefault();
+    const targetId = href.substring(1);
+    const element = document.getElementById(targetId);
+    if (element) {
+      element.scrollIntoView({ behavior: 'smooth' });
+    }
+  };
+
+  const containerVariants = {
+    hidden: { opacity: 0 },
+    visible: {
+      opacity: 1,
+      transition: { staggerChildren: 0.1, delayChildren: 0.2 },
+    },
+  };
+
+  const itemVariants = {
+    hidden: { y: 20, opacity: 0 },
+    visible: {
+      y: 0,
+      opacity: 1,
+      transition: { type: 'spring' as const, stiffness: 100, damping: 10 },
+    },
+  };
+
   return (
     <section className="relative py-24 overflow-hidden">
       {/* Subtle gradient background – Apple style */}
@@ -12,35 +48,47 @@ export default function LandingHero() {
       <div className="container">
         <div className="grid gap-12 lg:grid-cols-2 lg:gap-16 items-center">
           {/* Text column */}
-          <div className="space-y-6 max-w-2xl mx-auto lg:mx-0 text-center lg:text-left">
+          <motion.div
+            className="space-y-6 max-w-2xl mx-auto lg:mx-0 text-center lg:text-left"
+            variants={containerVariants}
+            initial="hidden"
+            animate="visible"
+          >
             {/* Badge */}
-            <div className="animate-fade-up" style={{ animationDelay: '0.2s' }}>
+            <motion.div variants={itemVariants}>
               <div className="apple-badge mx-auto lg:mx-0 w-fit">
                 <span className="mr-1.5 h-2 w-2 rounded-full bg-apple-blue animate-pulse inline-block" />
                 {siteConfig.hero.badge}
               </div>
-            </div>
+            </motion.div>
 
-            {/* Heading — rendered immediately for LCP */}
-            <h1 className="text-4xl font-semibold tracking-tight sm:text-5xl md:text-6xl">
+            {/* Heading */}
+            <motion.h1
+              className="text-4xl font-semibold tracking-tight sm:text-5xl md:text-6xl"
+              variants={itemVariants}
+            >
               <span className="block text-foreground">{siteConfig.hero.titleLine1}</span>
               <span className="block mt-1 bg-clip-text text-transparent bg-gradient-to-r from-apple-blue to-blue-400">
                 {siteConfig.hero.titleLine2}
               </span>
-            </h1>
+            </motion.h1>
 
-            {/* Subtitle — rendered immediately for LCP */}
-            <p className="text-xl text-muted-foreground font-medium max-w-xl mx-auto lg:mx-0">
+            {/* Subtitle */}
+            <motion.p
+              className="text-xl text-muted-foreground font-medium max-w-xl mx-auto lg:mx-0"
+              variants={itemVariants}
+            >
               {siteConfig.hero.subtitle}
-            </p>
+            </motion.p>
 
             {/* CTA buttons */}
-            <div
-              className="flex flex-col sm:flex-row justify-center lg:justify-start gap-3 animate-fade-up"
-              style={{ animationDelay: '0.3s' }}
+            <motion.div
+              className="flex flex-col sm:flex-row justify-center lg:justify-start gap-3"
+              variants={itemVariants}
             >
               <Link
                 href={siteConfig.cta.primary.href}
+                onClick={(e) => scrollToSection({ e, href: siteConfig.cta.primary.href })}
                 className="group inline-flex items-center justify-center gap-2 rounded-full bg-apple-blue text-white px-8 h-12 text-sm font-medium hover:bg-apple-blue/90 transition-colors"
               >
                 <Download className="h-4 w-4" />
@@ -50,27 +98,28 @@ export default function LandingHero() {
 
               <Link
                 href={siteConfig.cta.secondary.href}
+                onClick={(e) => scrollToSection({ e, href: siteConfig.cta.secondary.href })}
                 className="inline-flex items-center justify-center gap-2 rounded-full border border-border bg-background px-8 h-12 text-sm font-medium hover:bg-black/5 dark:hover:bg-white/10 transition-colors"
               >
                 {siteConfig.cta.secondary.text}
               </Link>
-            </div>
+            </motion.div>
 
             {/* Social proof */}
             {siteConfig.hero.socialProof && (
-              <p
-                className="text-xs text-muted-foreground flex items-center justify-center lg:justify-start gap-1 animate-fade-up"
-                style={{ animationDelay: '0.4s' }}
+              <motion.p
+                className="text-xs text-muted-foreground flex items-center justify-center lg:justify-start gap-1"
+                variants={itemVariants}
               >
                 <Star className="w-3 h-3 text-amber-400 fill-amber-400 flex-shrink-0" />
                 {siteConfig.hero.socialProof}
-              </p>
+              </motion.p>
             )}
 
             {/* Stats */}
-            <div
-              className="flex flex-col sm:flex-row items-center justify-center lg:justify-start gap-6 pt-4 animate-fade-up"
-              style={{ animationDelay: '0.5s' }}
+            <motion.div
+              className="flex flex-col sm:flex-row items-center justify-center lg:justify-start gap-6 pt-4"
+              variants={itemVariants}
             >
               <div className="flex -space-x-2">
                 {siteConfig.testimonials.items.slice(0, 4).map((user) => (
@@ -91,13 +140,15 @@ export default function LandingHero() {
                   </div>
                 ))}
               </div>
-            </div>
-          </div>
+            </motion.div>
+          </motion.div>
 
           {/* Device mockup column */}
-          <div
-            className="relative mx-auto lg:mx-0 animate-scale-in"
-            style={{ animationDelay: '0.2s' }}
+          <motion.div
+            className="relative mx-auto lg:mx-0"
+            initial={{ scale: 0.95 }}
+            animate={{ scale: 1 }}
+            transition={{ duration: 0.5, delay: 0.2 }}
           >
             <DeviceMockup
               image="/images/app/dashboard.png"
@@ -108,9 +159,11 @@ export default function LandingHero() {
             />
 
             {/* Floating cards – Apple style: clean card with subtle shadow */}
-            <div
-              className="absolute top-[10%] -left-16 hidden lg:block animate-slide-in-left"
-              style={{ animationDelay: '0.6s' }}
+            <motion.div
+              className="absolute top-[10%] -left-16 hidden lg:block"
+              initial={{ x: -20 }}
+              animate={{ x: 0 }}
+              transition={{ duration: 0.5, delay: 0.6 }}
             >
               <div className="apple-card p-3">
                 <div className="flex items-center gap-2">
@@ -127,11 +180,13 @@ export default function LandingHero() {
                   </div>
                 </div>
               </div>
-            </div>
+            </motion.div>
 
-            <div
-              className="absolute bottom-[15%] -right-10 hidden lg:block animate-slide-in-right"
-              style={{ animationDelay: '0.8s' }}
+            <motion.div
+              className="absolute bottom-[15%] -right-10 hidden lg:block"
+              initial={{ x: 20 }}
+              animate={{ x: 0 }}
+              transition={{ duration: 0.5, delay: 0.8 }}
             >
               <div className="apple-card p-3">
                 <div className="flex items-center gap-2">
@@ -144,8 +199,8 @@ export default function LandingHero() {
                   </div>
                 </div>
               </div>
-            </div>
-          </div>
+            </motion.div>
+          </motion.div>
         </div>
       </div>
     </section>
diff --git a/apps/landing/components/site-footer.tsx b/apps/landing/components/site-footer.tsx
index efc8e9e153..146b34b307 100644
--- a/apps/landing/components/site-footer.tsx
+++ b/apps/landing/components/site-footer.tsx
@@ -1,9 +1,27 @@
+'use client';
+
 import { siteConfig } from 'landing-app/config/site';
 import { LucideIcon, TikTokIcon } from 'landing-app/lib/icons';
 import { Backpack } from 'lucide-react';
 import Link from 'next/link';
+import type React from 'react';
 
 export default function SiteFooter() {
+  const scrollToSection = ({
+    e,
+    href,
+  }: {
+    e: React.MouseEvent<HTMLAnchorElement>;
+    href: string;
+  }) => {
+    e.preventDefault();
+    const targetId = href.substring(1);
+    const element = document.getElementById(targetId);
+    if (element) {
+      element.scrollIntoView({ behavior: 'smooth' });
+    }
+  };
+
   return (
     <footer className="border-t border-border/40 py-10 md:py-14 lg:py-16 bg-apple-gray-light dark:bg-gray-900/20">
       <div className="container">
@@ -46,6 +64,9 @@ export default function SiteFooter() {
                 <li key={item.title}>
                   <Link
                     href={item.href}
+                    onClick={(e) =>
+                      item.href.startsWith('#') && scrollToSection({ e, href: item.href })
+                    }
                     className="text-sm text-muted-foreground hover:text-apple-blue transition-colors"
                   >
                     {item.title}
@@ -63,6 +84,9 @@ export default function SiteFooter() {
                 <li key={item.title}>
                   <Link
                     href={item.href}
+                    onClick={(e) =>
+                      item.href.startsWith('#') && scrollToSection({ e, href: item.href })
+                    }
                     className="text-sm text-muted-foreground hover:text-apple-blue transition-colors"
                   >
                     {item.title}
@@ -80,6 +104,9 @@ export default function SiteFooter() {
                 <li key={item.title}>
                   <Link
                     href={item.href}
+                    onClick={(e) =>
+                      item.href.startsWith('#') && scrollToSection({ e, href: item.href })
+                    }
                     className="text-sm text-muted-foreground hover:text-apple-blue transition-colors"
                   >
                     {item.title}
diff --git a/apps/trails/components/TrailsPage.tsx b/apps/trails/components/TrailsPage.tsx
index 1c6785fe71..61f4f99167 100644
--- a/apps/trails/components/TrailsPage.tsx
+++ b/apps/trails/components/TrailsPage.tsx
@@ -59,7 +59,7 @@ export function TrailsPage() {
       }
 
       try {
-        const trails = await loadNearbyTrails(center[0], center[1]);
+        const trails = await loadNearbyTrails({ lat: center[0], lon: center[1] });
         if (!cancelled) setPublicTrails(trails);
       } catch {
         // Overpass failure is non-fatal; map still shows with no trails
diff --git a/apps/trails/lib/auth.ts b/apps/trails/lib/auth.ts
index 88cc129beb..3d95a64e1b 100644
--- a/apps/trails/lib/auth.ts
+++ b/apps/trails/lib/auth.ts
@@ -28,9 +28,15 @@ export function getRefreshToken(): string | null {
   return parseToken(safeLocalStorage.getItem(REFRESH_KEY));
 }
 
-export function setTokens(accessToken: string, refreshToken: string): void {
-  safeLocalStorage.setItem(ACCESS_KEY, accessToken);
-  safeLocalStorage.setItem(REFRESH_KEY, refreshToken);
+export function setTokens({
+  accessToken,
+  refreshToken,
+}: {
+  accessToken: string;
+  refreshToken: string;
+}): void {
+  safeLocalStorage.setItem({ key: ACCESS_KEY, value: accessToken });
+  safeLocalStorage.setItem({ key: REFRESH_KEY, value: refreshToken });
 }
 
 export function clearTokens(): void {
@@ -48,7 +54,7 @@ export const UserInfoSchema = z.object({
 export type UserInfo = z.infer<typeof UserInfoSchema>;
 
 export function setUser(user: UserInfo): void {
-  safeLocalStorage.setItem('user', JSON.stringify(user));
+  safeLocalStorage.setItem({ key: 'user', value: JSON.stringify(user) });
 }
 
 export function getUser(): UserInfo | null {
diff --git a/apps/trails/lib/overpass.ts b/apps/trails/lib/overpass.ts
index dc1ba28716..b3617a592f 100644
--- a/apps/trails/lib/overpass.ts
+++ b/apps/trails/lib/overpass.ts
@@ -12,13 +12,20 @@ export interface TrailSummaryWithCoords {
   center: [number, number] | null;
 }
 
-export async function loadNearbyTrails(
-  lat: number,
-  lon: number,
-): Promise<TrailSummaryWithCoords[]> {
-  const ql = new TrailQueryBuilder().sport('hiking').around(lat, lon, 15_000).timeout(30).build();
+export async function loadNearbyTrails({
+  lat,
+  lon,
+}: {
+  lat: number;
+  lon: number;
+}): Promise<TrailSummaryWithCoords[]> {
+  const ql = new TrailQueryBuilder()
+    .sport('hiking')
+    .around({ lat, lon, radiusM: 15_000 })
+    .timeout(30)
+    .build();
 
-  const result = await queryOverpass(ql);
+  const result = await queryOverpass({ ql });
 
   return result.elements.map((el) => {
     const summary = toTrailSummary(el);
diff --git a/apps/trails/lib/useAuth.tsx b/apps/trails/lib/useAuth.tsx
index ef4c8b473f..48ec6e21ca 100644
--- a/apps/trails/lib/useAuth.tsx
+++ b/apps/trails/lib/useAuth.tsx
@@ -78,7 +78,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         // autoSignIn: true succeeded — token is the Bearer session token
         const parsedUser = parseAuthUser(data.user as Parameters<typeof parseAuthUser>[0]);
         if (!parsedUser) throw new Error('Registration failed: unexpected user shape');
-        setTokens(data.token, '');
+        setTokens({ accessToken: data.token, refreshToken: '' });
         setUser(parsedUser);
         setState({ isAuthed: true, user: parsedUser, pendingEmail: null });
         setAuthGateOpen(false);
@@ -100,7 +100,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       }
       const parsedUser = parseAuthUser(sessionRes.data.user as Parameters<typeof parseAuthUser>[0]);
       if (!parsedUser) throw new Error('Verification failed: unexpected user shape');
-      setTokens(sessionRes.data.session.token, '');
+      setTokens({ accessToken: sessionRes.data.session.token, refreshToken: '' });
       setUser(parsedUser);
       setState({ isAuthed: true, user: parsedUser, pendingEmail: null });
       setAuthGateOpen(false);
@@ -122,7 +122,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     if (error || !data) throw new Error(error?.message ?? 'Login failed');
     const parsedUser = parseAuthUser(data.user as Parameters<typeof parseAuthUser>[0]);
     if (!parsedUser) throw new Error('Login failed: unexpected user shape');
-    setTokens(data.token, '');
+    setTokens({ accessToken: data.token, refreshToken: '' });
     setUser(parsedUser);
     setState({ isAuthed: true, user: parsedUser, pendingEmail: null });
     setAuthGateOpen(false);
diff --git a/apps/web/app/auth/page.tsx b/apps/web/app/auth/page.tsx
index d47266cf9d..6c989613c1 100644
--- a/apps/web/app/auth/page.tsx
+++ b/apps/web/app/auth/page.tsx
@@ -62,7 +62,7 @@ export default function AuthPage() {
         onSuccess: (data) => {
           const token = (data as { token?: string }).token ?? '';
           if (!token) return;
-          setTokens(token, '');
+          setTokens({ accessToken: token, refreshToken: '' });
           router.push('/');
         },
       },
diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
index c28063fa34..e391e41751 100644
--- a/apps/web/app/page.tsx
+++ b/apps/web/app/page.tsx
@@ -17,7 +17,7 @@ export default function App() {
   return (
     <WeightProvider>
       <AppShell>
-        {(screen, navigate) => {
+        {({ screen, navigate }) => {
           switch (screen) {
             case 'home':
               return <HomeScreen navigate={navigate} />;
diff --git a/apps/web/components/app-shell.tsx b/apps/web/components/app-shell.tsx
index ccb2b85275..fa380419a3 100644
--- a/apps/web/components/app-shell.tsx
+++ b/apps/web/components/app-shell.tsx
@@ -51,7 +51,7 @@ const mainNav: NavItem[] = [
 ];
 
 interface AppShellProps {
-  children: (screen: Screen, navigate: (s: Screen) => void) => React.ReactNode;
+  children: (args: { screen: Screen; navigate: (s: Screen) => void }) => React.ReactNode;
 }
 
 export function AppShell({ children }: AppShellProps) {
@@ -144,7 +144,7 @@ export function AppShell({ children }: AppShellProps) {
         </header>
 
         {/* Page content */}
-        <div className="flex-1 overflow-y-auto">{children(screen, setScreen)}</div>
+        <div className="flex-1 overflow-y-auto">{children({ screen, navigate: setScreen })}</div>
 
         {/* Notifications Panel */}
         <NotificationsPanel open={showNotifications} onClose={() => setShowNotifications(false)} />
diff --git a/apps/web/components/screens/gear-inventory-screen.tsx b/apps/web/components/screens/gear-inventory-screen.tsx
index 089a82316a..df20f0cdaf 100644
--- a/apps/web/components/screens/gear-inventory-screen.tsx
+++ b/apps/web/components/screens/gear-inventory-screen.tsx
@@ -58,7 +58,8 @@ export function GearInventoryScreen({ onBack: _onBack }: { onBack?: () => void }
   const totalWeight = useMemo(
     () =>
       filtered.reduce(
-        (sum, item) => sum + toGrams(item.weight, item.weightUnit) * item.quantity,
+        (sum, item) =>
+          sum + toGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity,
         0,
       ),
     [filtered],
@@ -111,7 +112,7 @@ export function GearInventoryScreen({ onBack: _onBack }: { onBack?: () => void }
           </div>
         ) : (
           filtered.map((item) => {
-            const itemWeightG = toGrams(item.weight, item.weightUnit);
+            const itemWeightG = toGrams({ weight: item.weight, unit: item.weightUnit });
             return (
               <div
                 key={item.id}
diff --git a/apps/web/components/screens/trips-screen.tsx b/apps/web/components/screens/trips-screen.tsx
index e6b871662c..a619cef96a 100644
--- a/apps/web/components/screens/trips-screen.tsx
+++ b/apps/web/components/screens/trips-screen.tsx
@@ -192,7 +192,7 @@ function TripCard({
       <h3 className="font-semibold text-base">{trip.name}</h3>
       <div className="flex items-center gap-2 mt-1 text-xs text-muted-foreground">
         <Calendar className="h-3.5 w-3.5" />
-        <span>{formatDateRange(trip.startDate, trip.endDate)}</span>
+        <span>{formatDateRange({ start: trip.startDate, end: trip.endDate })}</span>
       </div>
 
       {trip.description && (
@@ -253,7 +253,7 @@ function TripDetail({
         <div className="flex-1 min-w-0">
           <h1 className="text-xl font-bold truncate">{trip.name}</h1>
           <p className="text-xs text-muted-foreground">
-            {formatDateRange(trip.startDate, trip.endDate)}
+            {formatDateRange({ start: trip.startDate, end: trip.endDate })}
           </p>
         </div>
       </div>
@@ -371,7 +371,7 @@ function TripDetail({
   );
 }
 
-function formatDateRange(start?: string | null, end?: string | null): string {
+function formatDateRange({ start, end }: { start?: string | null; end?: string | null }): string {
   if (!start) return 'Dates TBD';
   const s = new Date(start);
   const startStr = s.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
diff --git a/apps/web/lib/auth.ts b/apps/web/lib/auth.ts
index f40c34e00f..60a44fb9b9 100644
--- a/apps/web/lib/auth.ts
+++ b/apps/web/lib/auth.ts
@@ -1,6 +1,12 @@
 import Cookies from 'js-cookie';
 
-export function setTokens(accessToken: string, refreshToken: string) {
+export function setTokens({
+  accessToken,
+  refreshToken,
+}: {
+  accessToken: string;
+  refreshToken: string;
+}) {
   Cookies.set('access_token', accessToken, { expires: 1, sameSite: 'strict' });
   Cookies.set('refresh_token', refreshToken, { expires: 30, sameSite: 'strict' });
 }
diff --git a/apps/web/lib/data.ts b/apps/web/lib/data.ts
index eb0f05e6c6..a7d353e803 100644
--- a/apps/web/lib/data.ts
+++ b/apps/web/lib/data.ts
@@ -15,7 +15,7 @@ import type {
 
 // ── Weight helpers ───────────────────────────────────────────────────────────
 
-export function toGrams(weight: number, unit: WeightUnit): number {
+export function toGrams({ weight, unit }: { weight: number; unit: WeightUnit }): number {
   switch (unit) {
     case 'oz':
       return Math.round(weight * 28.3495);
@@ -28,7 +28,7 @@ export function toGrams(weight: number, unit: WeightUnit): number {
   }
 }
 
-export function fromGrams(grams: number, unit: WeightUnit): number {
+export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number {
   switch (unit) {
     case 'oz':
       return Math.round((grams / 28.3495) * 10) / 10;
@@ -41,8 +41,8 @@ export function fromGrams(grams: number, unit: WeightUnit): number {
   }
 }
 
-export function formatWeight(grams: number, unit: WeightUnit): string {
-  const value = fromGrams(grams, unit);
+export function formatWeight({ grams, unit }: { grams: number; unit: WeightUnit }): string {
+  const value = fromGrams({ grams, unit });
   return `${value}${unit}`;
 }
 
@@ -369,7 +369,7 @@ function calcWeights(items: PackItem[]): { totalWeight: number; baseWeight: numb
   let total = 0;
   let base = 0;
   for (const item of items) {
-    const w = toGrams(item.weight, item.weightUnit) * item.quantity;
+    const w = toGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity;
     total += w;
     if (!item.consumable && !item.worn) {
       base += w;
@@ -1219,7 +1219,13 @@ export async function fetchCurrentUser(): Promise<User> {
 
 // ── Packs ────────────────────────────────────────────────────────────────────
 
-export async function fetchPacks(page = 1, limit = 10): Promise<PackListResponse> {
+export async function fetchPacks({
+  page = 1,
+  limit = 10,
+}: {
+  page?: number;
+  limit?: number;
+} = {}): Promise<PackListResponse> {
   await delay(300);
   const packs = mockPacks.filter((p) => !p.deleted);
   return {
diff --git a/apps/web/lib/weight-context.tsx b/apps/web/lib/weight-context.tsx
index 28a4371a99..d552500e44 100644
--- a/apps/web/lib/weight-context.tsx
+++ b/apps/web/lib/weight-context.tsx
@@ -22,7 +22,7 @@ const Ctx = createContext<WeightCtx>({
 export function WeightProvider({ children }: { children: React.ReactNode }) {
   const [unit, setUnit] = useAtom(weightUnitAtom);
   const toggleUnit = () => setUnit((u) => (u === 'g' ? 'oz' : 'g'));
-  const fw = (grams: number) => fmt(grams, unit);
+  const fw = (grams: number) => fmt({ grams, unit });
   return <Ctx.Provider value={{ unit, setUnit, toggleUnit, fw }}>{children}</Ctx.Provider>;
 }
 
diff --git a/package.json b/package.json
index 317ab9388f..5d3695158b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "ios": "cd apps/expo && bun ios",
     "lefthook": "lefthook install",
     "lint": "biome check --write",
-    "lint:custom": "bun run scripts/lint/no-raw-typeof.ts && bun run scripts/lint/no-raw-regex.ts && bun run packages/env/scripts/no-raw-process-env.ts && bun run scripts/lint/no-duplicate-guards.ts && bun run scripts/lint/no-unauth-routes.ts && bun run scripts/lint/check-drizzle-migrations.ts",
+    "lint:custom": "bun run scripts/lint/no-raw-typeof.ts && bun run scripts/lint/no-raw-regex.ts && bun run scripts/lint/no-owned-max-params.ts && bun run packages/env/scripts/no-raw-process-env.ts && bun run scripts/lint/no-duplicate-guards.ts && bun run scripts/lint/no-unauth-routes.ts && bun run scripts/lint/check-drizzle-migrations.ts",
     "lint:strict": "biome check && bun run lint:custom",
     "lint-unsafe": "biome check --write --unsafe",
     "mcp": "bun run --cwd packages/mcp dev",
diff --git a/packages/analytics/src/core/cache-metadata.ts b/packages/analytics/src/core/cache-metadata.ts
index d1a98f23a0..c71a8c0eec 100644
--- a/packages/analytics/src/core/cache-metadata.ts
+++ b/packages/analytics/src/core/cache-metadata.ts
@@ -44,7 +44,13 @@ export function loadMetadata(cacheDir: string): CacheMetadataFile | null {
   return result.success ? result.data : null;
 }
 
-export function saveMetadata(cacheDir: string, data: CacheMetadataFile): void {
+export function saveMetadata({
+  cacheDir,
+  data,
+}: {
+  cacheDir: string;
+  data: CacheMetadataFile;
+}): void {
   const validated = MetadataSchema.parse(data);
   writeFileSync(metadataPath(cacheDir), JSON.stringify(validated, null, 2));
 }
diff --git a/packages/analytics/src/core/enrichment.ts b/packages/analytics/src/core/enrichment.ts
index b92c1e3a9d..61e46d0685 100644
--- a/packages/analytics/src/core/enrichment.ts
+++ b/packages/analytics/src/core/enrichment.ts
@@ -153,10 +153,16 @@ const REVIEWS_TABLE = 'product_reviews';
 const ENTITIES_TABLE = 'product_entities';
 
 export class Enrichment {
-  constructor(
-    private readonly conn: DuckDBConnection,
-    private readonly sourceTable = 'gear_data',
-  ) {}
+  private readonly conn: DuckDBConnection;
+  private readonly sourceTable: string;
+
+  constructor({
+    conn,
+    sourceTable = 'gear_data',
+  }: { conn: DuckDBConnection; sourceTable?: string }) {
+    this.conn = conn;
+    this.sourceTable = sourceTable;
+  }
 
   private async hasEntities(): Promise<boolean> {
     try {
@@ -260,7 +266,13 @@ export class Enrichment {
   }
 
   /** Get images for a product by keyword. */
-  async getProductImages(query: string, limit = 20): Promise<ProductImage[]> {
+  async getProductImages({
+    query,
+    limit = 20,
+  }: {
+    query: string;
+    limit?: number;
+  }): Promise<ProductImage[]> {
     try {
       await this.conn.runAndReadAll(`SELECT 1 FROM ${IMAGES_TABLE} LIMIT 1`);
     } catch {
@@ -289,7 +301,13 @@ export class Enrichment {
   }
 
   /** Get review aggregation with weighted average for a product. */
-  async getProductReviews(query: string, limit = 20): Promise<ProductReview[]> {
+  async getProductReviews({
+    query,
+    limit = 20,
+  }: {
+    query: string;
+    limit?: number;
+  }): Promise<ProductReview[]> {
     try {
       await this.conn.runAndReadAll(`SELECT 1 FROM ${REVIEWS_TABLE} LIMIT 1`);
     } catch {
diff --git a/packages/analytics/src/core/entity-resolver.ts b/packages/analytics/src/core/entity-resolver.ts
index 6f755c2a8d..b69850ce69 100644
--- a/packages/analytics/src/core/entity-resolver.ts
+++ b/packages/analytics/src/core/entity-resolver.ts
@@ -47,7 +47,7 @@ function normalizeBrand(brand: string): string {
   return brand.toLowerCase().replace(NON_ALPHANUMERIC, '').trim();
 }
 
-function canonicalId(brand: string, name: string): string {
+function canonicalId({ brand, name }: { brand: string; name: string }): string {
   const key = `${normalizeBrand(brand)}:${normalizeName(name)}`;
   return createHash('sha256').update(key).digest('hex').slice(0, 16);
 }
@@ -65,7 +65,7 @@ function extractSlug(url: string): string {
  * Sorts tokens alphabetically then computes char-level similarity.
  * Good enough for product name matching without a heavy dep.
  */
-function tokenSortRatio(a: string, b: string): number {
+function tokenSortRatio({ a, b }: { a: string; b: string }): number {
   const sortTokens = (s: string) =>
     s.toLowerCase().split(WHITESPACE_SPLIT_PATTERN).sort().join(' ');
   const sa = sortTokens(a);
@@ -76,11 +76,11 @@ function tokenSortRatio(a: string, b: string): number {
 
   // Levenshtein-based ratio
   const len = Math.max(sa.length, sb.length);
-  const dist = levenshtein(sa, sb);
+  const dist = levenshtein({ a: sa, b: sb });
   return Math.round(((len - dist) / len) * 100);
 }
 
-function levenshtein(a: string, b: string): number {
+function levenshtein({ a, b }: { a: string; b: string }): number {
   const m = a.length;
   const n = b.length;
   const dp: number[][] = Array.from({ length: m + 1 }, () => Array<number>(n + 1).fill(0));
@@ -141,7 +141,7 @@ class UnionFind {
     return root;
   }
 
-  union(a: number, b: number): void {
+  union({ a, b }: { a: number; b: number }): void {
     const ra = this.find(a);
     const rb = this.find(b);
     if (ra !== rb) this.parent.set(rb, ra);
@@ -191,10 +191,15 @@ interface EntityRow {
 const ENTITIES_TABLE = 'product_entities';
 
 export class EntityResolver {
-  constructor(
-    private readonly conn: DuckDBConnection,
-    private readonly sourceTable = 'gear_data',
-  ) {}
+  constructor({
+    conn,
+    sourceTable = 'gear_data',
+  }: { conn: DuckDBConnection; sourceTable?: string }) {
+    this.conn = conn;
+    this.sourceTable = sourceTable;
+  }
+  private readonly conn: DuckDBConnection;
+  private readonly sourceTable: string;
 
   /** Run full entity resolution pipeline. */
   async build(
@@ -206,10 +211,10 @@ export class EntityResolver {
 
     for (const block of blocks.values()) {
       if (block.length > MAX_BLOCK_SIZE) continue;
-      matches.push(...this.matchWithinBlock(block, minConfidence));
+      matches.push(...this.matchWithinBlock({ block, minConfidence }));
     }
 
-    const entities = this.buildEntities(candidates, matches);
+    const entities = this.buildEntities({ candidates, matches });
     await this.writeEntities(entities);
 
     const uniqueEntities = new Set(entities.map((e) => e.canonical_id)).size;
@@ -258,10 +263,13 @@ export class EntityResolver {
     return blocks;
   }
 
-  private matchWithinBlock(
-    block: Candidate[],
-    minConfidence: number,
-  ): [number, number, number, string][] {
+  private matchWithinBlock({
+    block,
+    minConfidence,
+  }: {
+    block: Candidate[];
+    minConfidence: number;
+  }): [number, number, number, string][] {
     const matches: [number, number, number, string][] = [];
 
     for (let i = 0; i < block.length; i++) {
@@ -281,14 +289,14 @@ export class EntityResolver {
         }
 
         // Token-sort fuzzy
-        const nameScore = tokenSortRatio(a.normalized_name, b.normalized_name);
+        const nameScore = tokenSortRatio({ a: a.normalized_name, b: b.normalized_name });
         let confidence = nameScore / 100;
 
         // URL slug boost
         const slugA = extractSlug(a.product_url);
         const slugB = extractSlug(b.product_url);
         if (slugA && slugB && slugA.length > 5) {
-          const slugScore = tokenSortRatio(slugA, slugB);
+          const slugScore = tokenSortRatio({ a: slugA, b: slugB });
           if (slugScore > 70) {
             confidence = confidence * 0.1 + (slugScore / 100) * 0.9;
           }
@@ -309,10 +317,13 @@ export class EntityResolver {
     return matches;
   }
 
-  private buildEntities(
-    candidates: Candidate[],
-    matches: [number, number, number, string][],
-  ): EntityRow[] {
+  private buildEntities({
+    candidates,
+    matches,
+  }: {
+    candidates: Candidate[];
+    matches: [number, number, number, string][];
+  }): EntityRow[] {
     const uf = new UnionFind();
     const matchMap = new Map<number, { confidence: number; method: string }>();
 
@@ -321,7 +332,7 @@ export class EntityResolver {
 
     // Union matched pairs
     for (const [a, b, confidence, method] of matches) {
-      uf.union(a, b);
+      uf.union({ a, b });
       // Track highest confidence per candidate
       const existing = matchMap.get(a);
       if (!existing || confidence > existing.confidence) matchMap.set(a, { confidence, method });
@@ -336,7 +347,7 @@ export class EntityResolver {
     for (const [root, members] of groups) {
       const rootCandidate = candidates[root];
       assertDefined(rootCandidate);
-      const cid = canonicalId(rootCandidate.brand, rootCandidate.name);
+      const cid = canonicalId({ brand: rootCandidate.brand, name: rootCandidate.name });
 
       for (const idx of members) {
         const c = candidates[idx];
@@ -396,7 +407,13 @@ export class EntityResolver {
   }
 
   /** Find all retailer listings for a product. */
-  async identifyProduct(query: string, limit = 20): Promise<EntityRow[]> {
+  async identifyProduct({
+    query,
+    limit = 20,
+  }: {
+    query: string;
+    limit?: number;
+  }): Promise<EntityRow[]> {
     const kw = SQLFragments.escapeSql(query.toLowerCase());
     const result = await this.conn.runAndReadAll(`
       SELECT * FROM ${ENTITIES_TABLE}
diff --git a/packages/analytics/src/core/local-cache.ts b/packages/analytics/src/core/local-cache.ts
index dcd9ffad2b..0188c583bf 100644
--- a/packages/analytics/src/core/local-cache.ts
+++ b/packages/analytics/src/core/local-cache.ts
@@ -129,13 +129,16 @@ export class LocalCacheManager {
     const sites = sitesResult.getRows().map((r) => String(r[0]));
 
     const now = new Date().toISOString();
-    saveMetadata(this.cacheDir, {
-      version: DBConfig.CACHE_VERSION,
-      schema_version: DBConfig.SCHEMA_VERSION,
-      created_at: this.metadata?.created_at ?? now,
-      updated_at: now,
-      record_count: recordCount,
-      sites,
+    saveMetadata({
+      cacheDir: this.cacheDir,
+      data: {
+        version: DBConfig.CACHE_VERSION,
+        schema_version: DBConfig.SCHEMA_VERSION,
+        created_at: this.metadata?.created_at ?? now,
+        updated_at: now,
+        record_count: recordCount,
+        sites,
+      },
     });
     this.metadata = loadMetadata(this.cacheDir);
   }
@@ -168,10 +171,13 @@ export class LocalCacheManager {
 
   // ── Search ──────────────────────────────────────────────────────────
 
-  async search(
-    keyword: string,
-    options: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number } = {},
-  ): Promise<CatalogRow[]> {
+  async search({
+    keyword,
+    options = {},
+  }: {
+    keyword: string;
+    options?: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number };
+  }): Promise<CatalogRow[]> {
     const { sites, minPrice, maxPrice, limit = DBConfig.DEFAULT_LIMIT } = options;
     const kw = SQLFragments.escapeSql(keyword.toLowerCase());
 
@@ -195,7 +201,13 @@ export class LocalCacheManager {
 
   // ── Price Comparison ────────────────────────────────────────────────
 
-  async comparePrices(keyword: string, sites?: string[]): Promise<PriceComparison[]> {
+  async comparePrices({
+    keyword,
+    sites,
+  }: {
+    keyword: string;
+    sites?: string[];
+  }): Promise<PriceComparison[]> {
     const kw = SQLFragments.escapeSql(keyword.toLowerCase());
 
     const conditions = [`(LOWER(name) LIKE '%${kw}%' OR LOWER(brand) LIKE '%${kw}%')`];
@@ -220,7 +232,13 @@ export class LocalCacheManager {
 
   // ── Brand Analysis ──────────────────────────────────────────────────
 
-  async analyzeBrand(brandName: string, sites?: string[]): Promise<BrandAnalysis[]> {
+  async analyzeBrand({
+    brandName,
+    sites,
+  }: {
+    brandName: string;
+    sites?: string[];
+  }): Promise<BrandAnalysis[]> {
     const brand = SQLFragments.escapeSql(brandName.toLowerCase());
 
     const conditions = [`LOWER(brand) LIKE '%${brand}%'`];
@@ -246,7 +264,13 @@ export class LocalCacheManager {
 
   // ── Category Insights ───────────────────────────────────────────────
 
-  async categoryInsights(categoryKeyword: string, sites?: string[]): Promise<CategoryInsights[]> {
+  async categoryInsights({
+    categoryKeyword,
+    sites,
+  }: {
+    categoryKeyword: string;
+    sites?: string[];
+  }): Promise<CategoryInsights[]> {
     const cat = SQLFragments.escapeSql(categoryKeyword.toLowerCase());
 
     const conditions = [`LOWER(category) LIKE '%${cat}%'`];
@@ -272,10 +296,13 @@ export class LocalCacheManager {
 
   // ── Deals ───────────────────────────────────────────────────────────
 
-  async findDeals(
-    maxPrice: number,
-    options: { category?: string; sites?: string[]; limit?: number } = {},
-  ): Promise<CatalogRow[]> {
+  async findDeals({
+    maxPrice,
+    options = {},
+  }: {
+    maxPrice: number;
+    options?: { category?: string; sites?: string[]; limit?: number };
+  }): Promise<CatalogRow[]> {
     const { category, sites, limit = DBConfig.DEFAULT_LIMIT } = options;
 
     const conditions = [`price <= ${maxPrice}`, `price > 0`];
@@ -296,10 +323,13 @@ export class LocalCacheManager {
 
   // ── Trends ──────────────────────────────────────────────────────────
 
-  async searchTrends(
-    keyword: string,
-    options: { site?: string; days?: number; limit?: number } = {},
-  ): Promise<PriceTrend[]> {
+  async searchTrends({
+    keyword,
+    options = {},
+  }: {
+    keyword: string;
+    options?: { site?: string; days?: number; limit?: number };
+  }): Promise<PriceTrend[]> {
     const { site, days = 90 } = options;
     const kw = SQLFragments.escapeSql(keyword.toLowerCase());
 
@@ -350,10 +380,13 @@ export class LocalCacheManager {
 
   // ── Top Brands ──────────────────────────────────────────────────────
 
-  async getTopBrands(
+  async getTopBrands({
     limit = 20,
-    site?: string,
-  ): Promise<{ brand: string; product_count: number; avg_price: number }[]> {
+    site,
+  }: {
+    limit?: number;
+    site?: string;
+  } = {}): Promise<{ brand: string; product_count: number; avg_price: number }[]> {
     const conditions = ["brand != 'Unknown'"];
     if (site) conditions.push(`site = '${SQLFragments.escapeSql(site)}'`);
 
diff --git a/packages/analytics/src/core/query-builder.ts b/packages/analytics/src/core/query-builder.ts
index 654197e44b..42be6aa994 100644
--- a/packages/analytics/src/core/query-builder.ts
+++ b/packages/analytics/src/core/query-builder.ts
@@ -35,7 +35,7 @@ export class SQLFragments {
    *            NULLIF(TRIM(TRY_CAST(heading AS VARCHAR)), ''),
    *            'Unknown') as name
    */
-  static safeCoalesce(field: string, defaultValue?: string): string {
+  static safeCoalesce({ field, defaultValue }: { field: string; defaultValue?: string }): string {
     const variations = FIELD_MAPPINGS[field] ?? [field];
     let dflt: string;
     if (defaultValue !== undefined) {
@@ -78,10 +78,13 @@ export class SQLFragments {
   }
 
   /** Safe float extraction from FIELD_MAPPINGS with optional range check. */
-  static safeFloat(
-    field: string,
-    opts: { alias?: string; minVal?: number; maxVal?: number } = {},
-  ): string {
+  static safeFloat({
+    field,
+    opts = {},
+  }: {
+    field: string;
+    opts?: { alias?: string; minVal?: number; maxVal?: number };
+  }): string {
     const { alias, minVal, maxVal } = opts;
     const a = alias ?? field;
     const variations = FIELD_MAPPINGS[field] ?? [field];
@@ -111,7 +114,7 @@ export class SQLFragments {
   }
 
   /** Safe integer extraction from FIELD_MAPPINGS. */
-  static safeInt(field: string, alias?: string): string {
+  static safeInt({ field, alias }: { field: string; alias?: string }): string {
     const a = alias ?? field;
     const variations = FIELD_MAPPINGS[field] ?? [field];
 
@@ -149,7 +152,13 @@ export class SQLFragments {
   }
 
   /** Standard read_csv_auto clause reading from multiple version prefixes. */
-  static readCsvSource(bucketPath: string, globPatterns?: string[]): string {
+  static readCsvSource({
+    bucketPath,
+    globPatterns,
+  }: {
+    bucketPath: string;
+    globPatterns?: string[];
+  }): string {
     const globs = globPatterns ?? R2_CSV_GLOBS;
     const paths = globs.map((g) => `'${bucketPath}/${g}'`);
     const pathList = `[${paths.join(', ')}]`;
@@ -165,26 +174,29 @@ export class SQLFragments {
   static selectFields(): string[] {
     return [
       SQLFragments.siteExtract(),
-      SQLFragments.safeCoalesce('name'),
-      SQLFragments.safeCoalesce('brand'),
-      SQLFragments.safeCoalesce('category'),
+      SQLFragments.safeCoalesce({ field: 'name' }),
+      SQLFragments.safeCoalesce({ field: 'brand' }),
+      SQLFragments.safeCoalesce({ field: 'category' }),
       SQLFragments.safePrice(),
       SQLFragments.safeAvailability(),
-      SQLFragments.safeCoalesce('description'),
-      SQLFragments.safeCoalesce('product_url'),
-      SQLFragments.safeCoalesce('image_url'),
+      SQLFragments.safeCoalesce({ field: 'description' }),
+      SQLFragments.safeCoalesce({ field: 'product_url' }),
+      SQLFragments.safeCoalesce({ field: 'image_url' }),
       // V2 fields
-      SQLFragments.safeFloat('compare_at_price', { minVal: 0, maxVal: DBConfig.MAX_VALID_PRICE }),
-      SQLFragments.safeFloat('rating_value', { minVal: 0, maxVal: 5 }),
-      SQLFragments.safeInt('review_count'),
-      SQLFragments.safeFloat('weight', { minVal: -1 }),
-      SQLFragments.safeCoalesce('weight_unit', "''"),
-      SQLFragments.safeCoalesce('color'),
-      SQLFragments.safeCoalesce('size'),
-      SQLFragments.safeCoalesce('material'),
-      SQLFragments.safeCoalesce('tags'),
-      SQLFragments.safeCoalesce('published_at'),
-      SQLFragments.safeCoalesce('updated_at'),
+      SQLFragments.safeFloat({
+        field: 'compare_at_price',
+        opts: { minVal: 0, maxVal: DBConfig.MAX_VALID_PRICE },
+      }),
+      SQLFragments.safeFloat({ field: 'rating_value', opts: { minVal: 0, maxVal: 5 } }),
+      SQLFragments.safeInt({ field: 'review_count' }),
+      SQLFragments.safeFloat({ field: 'weight', opts: { minVal: -1 } }),
+      SQLFragments.safeCoalesce({ field: 'weight_unit', defaultValue: "''" }),
+      SQLFragments.safeCoalesce({ field: 'color' }),
+      SQLFragments.safeCoalesce({ field: 'size' }),
+      SQLFragments.safeCoalesce({ field: 'material' }),
+      SQLFragments.safeCoalesce({ field: 'tags' }),
+      SQLFragments.safeCoalesce({ field: 'published_at' }),
+      SQLFragments.safeCoalesce({ field: 'updated_at' }),
     ];
   }
 
@@ -226,7 +238,13 @@ export class SQLFragments {
   }
 
   /** WHERE clauses for price range filtering. */
-  static priceRangeFilter(minPrice?: number, maxPrice?: number): string[] {
+  static priceRangeFilter({
+    minPrice,
+    maxPrice,
+  }: {
+    minPrice?: number;
+    maxPrice?: number;
+  }): string[] {
     const conditions: string[] = [];
     if (minPrice !== undefined) {
       conditions.push(`(
@@ -257,19 +275,22 @@ export class QueryBuilder {
     return conditions.filter(Boolean).join(' AND ');
   }
 
-  searchQuery(
-    keyword: string,
-    opts: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number } = {},
-  ): string {
+  searchQuery({
+    keyword,
+    opts = {},
+  }: {
+    keyword: string;
+    opts?: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number };
+  }): string {
     const { sites, minPrice, maxPrice, limit = DBConfig.DEFAULT_LIMIT } = opts;
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
 
     const conditions: (string | null)[] = [
       ...SQLFragments.baseWhere(),
       SQLFragments.keywordFilter(keyword),
       sites ? SQLFragments.siteFilter(sites) : null,
-      ...SQLFragments.priceRangeFilter(minPrice, maxPrice),
+      ...SQLFragments.priceRangeFilter({ minPrice, maxPrice }),
     ];
 
     return `
@@ -281,9 +302,9 @@ export class QueryBuilder {
         `;
   }
 
-  priceComparisonQuery(keyword: string, sites?: string[]): string {
+  priceComparisonQuery({ keyword, sites }: { keyword: string; sites?: string[] }): string {
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
 
     const conditions: (string | null)[] = [
       ...SQLFragments.baseWhere(),
@@ -310,9 +331,9 @@ export class QueryBuilder {
         `;
   }
 
-  brandAnalysisQuery(brandName: string, sites?: string[]): string {
+  brandAnalysisQuery({ brandName, sites }: { brandName: string; sites?: string[] }): string {
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
 
     const conditions: (string | null)[] = [...SQLFragments.baseWhere()];
     const brandVariations = FIELD_MAPPINGS.brand ?? ['brand'];
@@ -342,9 +363,15 @@ export class QueryBuilder {
         `;
   }
 
-  categoryInsightsQuery(categoryKeyword: string, sites?: string[]): string {
+  categoryInsightsQuery({
+    categoryKeyword,
+    sites,
+  }: {
+    categoryKeyword: string;
+    sites?: string[];
+  }): string {
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
 
     const conditions: (string | null)[] = [...SQLFragments.baseWhere()];
     const catVariations = FIELD_MAPPINGS.category ?? ['category'];
@@ -374,17 +401,20 @@ export class QueryBuilder {
         `;
   }
 
-  dealsQuery(
-    maxPrice: number,
-    opts: { category?: string; sites?: string[]; limit?: number } = {},
-  ): string {
+  dealsQuery({
+    maxPrice,
+    opts = {},
+  }: {
+    maxPrice: number;
+    opts?: { category?: string; sites?: string[]; limit?: number };
+  }): string {
     const { category, sites, limit = DBConfig.DEFAULT_LIMIT } = opts;
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
 
     const conditions: (string | null)[] = [
       ...SQLFragments.baseWhere(),
-      ...SQLFragments.priceRangeFilter(undefined, maxPrice),
+      ...SQLFragments.priceRangeFilter({ maxPrice }),
     ];
     if (category) {
       const escapedCategory = SQLFragments.escapeSql(category.toLowerCase());
@@ -401,9 +431,15 @@ export class QueryBuilder {
         `;
   }
 
-  trendsQuery(keyword: string, opts: { sites?: string[]; days?: number } = {}): string {
+  trendsQuery({
+    keyword,
+    opts = {},
+  }: {
+    keyword: string;
+    opts?: { sites?: string[]; days?: number };
+  }): string {
     const { sites, days = 90 } = opts;
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
     const kw = SQLFragments.escapeSql(keyword.toLowerCase());
 
     const nameVariations = FIELD_MAPPINGS.name ?? ['name'];
@@ -454,7 +490,7 @@ export class QueryBuilder {
   /** Build a SELECT query for normalized gear data (no CREATE TABLE). */
   normalizedSelectQuery(): string {
     const select = SQLFragments.selectFields().join(',\n            ');
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
     const conditions = SQLFragments.baseWhere();
 
     return `
@@ -474,7 +510,7 @@ export class QueryBuilder {
 
   /** Build CREATE TABLE AS SELECT for price history cache. */
   createPriceHistoryTable(tableName = 'price_history'): string {
-    const source = SQLFragments.readCsvSource(this.bucketPath);
+    const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath });
     const maxP = DBConfig.MAX_VALID_PRICE;
 
     const nameVariations = FIELD_MAPPINGS.name ?? ['name'];
diff --git a/packages/analytics/src/core/spec-parser.ts b/packages/analytics/src/core/spec-parser.ts
index 6c60839368..d8d512ea00 100644
--- a/packages/analytics/src/core/spec-parser.ts
+++ b/packages/analytics/src/core/spec-parser.ts
@@ -80,12 +80,12 @@ const FABRIC_PATTERNS = [
 
 // ── Unit Conversion ───────────────────────────────────────────────────
 
-function toGrams(value: number, unit: string): number | null {
+function toGrams({ value, unit }: { value: number; unit: string }): number | null {
   const factor = WEIGHT_CONVERSIONS[unit.toLowerCase()];
   return factor ? Math.round(value * factor * 100) / 100 : null;
 }
 
-function toFahrenheit(value: number, unit: string): number {
+function toFahrenheit({ value, unit }: { value: number; unit: string }): number {
   if (unit.toUpperCase() === 'C') return Math.round((value * 9) / 5 + 32);
   return value;
 }
@@ -103,7 +103,7 @@ export function parseWeightGrams(text: string): number | null {
 
   const simple = WEIGHT_SIMPLE.exec(text);
   if (simple?.[1] !== undefined && simple[2] !== undefined) {
-    return toGrams(Number.parseFloat(simple[1]), simple[2]);
+    return toGrams({ value: Number.parseFloat(simple[1]), unit: simple[2] });
   }
   return null;
 }
@@ -118,12 +118,12 @@ export function parseTempRatingF(text: string): number | null {
   const range = TEMP_RANGE.exec(text);
   if (range?.[1] !== undefined && range[2] !== undefined && range[3] !== undefined) {
     const lower = Math.min(Number.parseInt(range[1], 10), Number.parseInt(range[2], 10));
-    return toFahrenheit(lower, range[3]);
+    return toFahrenheit({ value: lower, unit: range[3] });
   }
 
   const single = TEMP_SINGLE.exec(text);
   if (single?.[1] !== undefined && single[2] !== undefined) {
-    return toFahrenheit(Number.parseInt(single[1], 10), single[2]);
+    return toFahrenheit({ value: Number.parseInt(single[1], 10), unit: single[2] });
   }
   return null;
 }
@@ -215,10 +215,15 @@ export function extractSpecsFromRow(row: ProductRow): ProductSpecs {
 const SPECS_TABLE = 'parsed_specs';
 
 export class SpecParser {
-  constructor(
-    private readonly conn: DuckDBConnection,
-    private readonly sourceTable = 'gear_data',
-  ) {}
+  constructor({
+    conn,
+    sourceTable = 'gear_data',
+  }: { conn: DuckDBConnection; sourceTable?: string }) {
+    this.conn = conn;
+    this.sourceTable = sourceTable;
+  }
+  private readonly conn: DuckDBConnection;
+  private readonly sourceTable: string;
 
   /** Parse all products and store results in DuckDB. */
   async build(batchSize = 10_000): Promise<{ total: number; parsed: number }> {
@@ -287,7 +292,13 @@ export class SpecParser {
   }
 
   /** Search products by name/brand and return parsed specs. */
-  async getProductSpecs(query: string, limit = 10): Promise<ProductSpecs[]> {
+  async getProductSpecs({
+    query,
+    limit = 10,
+  }: {
+    query: string;
+    limit?: number;
+  }): Promise<ProductSpecs[]> {
     const kw = SQLFragments.escapeSql(query.toLowerCase());
     const result = await this.conn.runAndReadAll(`
       SELECT * FROM ${SPECS_TABLE}
diff --git a/packages/analytics/test/core/cache-metadata.test.ts b/packages/analytics/test/core/cache-metadata.test.ts
index f8b9a540b1..c5c9fe97df 100644
--- a/packages/analytics/test/core/cache-metadata.test.ts
+++ b/packages/analytics/test/core/cache-metadata.test.ts
@@ -35,7 +35,7 @@ describe('cache metadata', () => {
       sites: ['rei', 'backcountry'],
     };
 
-    saveMetadata(TEST_DIR, data);
+    saveMetadata({ cacheDir: TEST_DIR, data });
     expect(loadMetadata(TEST_DIR)).toEqual(data);
   });
 
diff --git a/packages/analytics/test/core/query-builder.test.ts b/packages/analytics/test/core/query-builder.test.ts
index 96bca2b44e..6edfdad997 100644
--- a/packages/analytics/test/core/query-builder.test.ts
+++ b/packages/analytics/test/core/query-builder.test.ts
@@ -31,7 +31,7 @@ describe('SQLFragments', () => {
 
   describe('safeCoalesce', () => {
     it('generates COALESCE for name field with all variations', () => {
-      const sql = SQLFragments.safeCoalesce('name');
+      const sql = SQLFragments.safeCoalesce({ field: 'name' });
       expect(sql).toContain('COALESCE(');
       expect(sql).toContain('name'); // column name from FIELD_MAPPINGS
       expect(sql).toContain("'Unknown'"); // default
@@ -39,12 +39,12 @@ describe('SQLFragments', () => {
     });
 
     it('uses custom default value', () => {
-      const sql = SQLFragments.safeCoalesce('brand', "'N/A'");
+      const sql = SQLFragments.safeCoalesce({ field: 'brand', defaultValue: "'N/A'" });
       expect(sql).toContain("'N/A'");
     });
 
     it('wraps unquoted default in quotes', () => {
-      const sql = SQLFragments.safeCoalesce('brand', 'N/A');
+      const sql = SQLFragments.safeCoalesce({ field: 'brand', defaultValue: 'N/A' });
       expect(sql).toContain("'N/A'");
     });
   });
@@ -70,14 +70,17 @@ describe('SQLFragments', () => {
 
   describe('readCsvSource', () => {
     it('generates read_csv_auto with bucket path', () => {
-      const sql = SQLFragments.readCsvSource('s3://my-bucket');
+      const sql = SQLFragments.readCsvSource({ bucketPath: 's3://my-bucket' });
       expect(sql).toContain("'s3://my-bucket/v2/*/*.csv'");
       expect(sql).toContain('union_by_name=true');
       expect(sql).toContain('filename=true');
     });
 
     it('uses custom glob patterns', () => {
-      const sql = SQLFragments.readCsvSource('s3://b', ['custom/*.csv']);
+      const sql = SQLFragments.readCsvSource({
+        bucketPath: 's3://b',
+        globPatterns: ['custom/*.csv'],
+      });
       expect(sql).toContain("'s3://b/custom/*.csv'");
       expect(sql).not.toContain('v1');
     });
@@ -139,24 +142,24 @@ describe('SQLFragments', () => {
 
   describe('priceRangeFilter', () => {
     it('generates min price condition', () => {
-      const conditions = SQLFragments.priceRangeFilter(10);
+      const conditions = SQLFragments.priceRangeFilter({ minPrice: 10 });
       expect(conditions.length).toBe(1);
       expect(conditions[0]).toContain('>= 10');
     });
 
     it('generates max price condition', () => {
-      const conditions = SQLFragments.priceRangeFilter(undefined, 100);
+      const conditions = SQLFragments.priceRangeFilter({ maxPrice: 100 });
       expect(conditions.length).toBe(1);
       expect(conditions[0]).toContain('<= 100');
     });
 
     it('generates both conditions', () => {
-      const conditions = SQLFragments.priceRangeFilter(10, 100);
+      const conditions = SQLFragments.priceRangeFilter({ minPrice: 10, maxPrice: 100 });
       expect(conditions.length).toBe(2);
     });
 
     it('returns empty array when no range', () => {
-      expect(SQLFragments.priceRangeFilter()).toEqual([]);
+      expect(SQLFragments.priceRangeFilter({})).toEqual([]);
     });
   });
 });
@@ -166,7 +169,7 @@ describe('QueryBuilder', () => {
 
   describe('searchQuery', () => {
     it('generates valid search SQL', () => {
-      const sql = qb.searchQuery('tent');
+      const sql = qb.searchQuery({ keyword: 'tent' });
       expect(sql).toContain('SELECT');
       expect(sql).toContain('FROM read_csv_auto');
       expect(sql).toContain('WHERE');
@@ -176,25 +179,25 @@ describe('QueryBuilder', () => {
     });
 
     it('applies site filter', () => {
-      const sql = qb.searchQuery('tent', { sites: ['rei'] });
+      const sql = qb.searchQuery({ keyword: 'tent', opts: { sites: ['rei'] } });
       expect(sql).toContain("'rei'");
     });
 
     it('applies price range', () => {
-      const sql = qb.searchQuery('tent', { minPrice: 50, maxPrice: 200 });
+      const sql = qb.searchQuery({ keyword: 'tent', opts: { minPrice: 50, maxPrice: 200 } });
       expect(sql).toContain('>= 50');
       expect(sql).toContain('<= 200');
     });
 
     it('uses custom limit', () => {
-      const sql = qb.searchQuery('tent', { limit: 50 });
+      const sql = qb.searchQuery({ keyword: 'tent', opts: { limit: 50 } });
       expect(sql).toContain('LIMIT 50');
     });
   });
 
   describe('priceComparisonQuery', () => {
     it('generates GROUP BY site query', () => {
-      const sql = qb.priceComparisonQuery('tent');
+      const sql = qb.priceComparisonQuery({ keyword: 'tent' });
       expect(sql).toContain('WITH base AS');
       expect(sql).toContain('GROUP BY site');
       expect(sql).toContain('avg_price');
@@ -204,20 +207,20 @@ describe('QueryBuilder', () => {
 
   describe('brandAnalysisQuery', () => {
     it('filters by brand name', () => {
-      const sql = qb.brandAnalysisQuery('patagonia');
+      const sql = qb.brandAnalysisQuery({ brandName: 'patagonia' });
       expect(sql).toContain("'%patagonia%'");
       expect(sql).toContain('GROUP BY site, category');
     });
 
     it('escapes brand name', () => {
-      const sql = qb.brandAnalysisQuery("Arc'teryx");
+      const sql = qb.brandAnalysisQuery({ brandName: "Arc'teryx" });
       expect(sql).toContain("arc''teryx");
     });
   });
 
   describe('categoryInsightsQuery', () => {
     it('filters by category and groups by site', () => {
-      const sql = qb.categoryInsightsQuery('jackets');
+      const sql = qb.categoryInsightsQuery({ categoryKeyword: 'jackets' });
       expect(sql).toContain("'%jackets%'");
       expect(sql).toContain('brand_count');
       expect(sql).toContain('GROUP BY site');
@@ -226,20 +229,20 @@ describe('QueryBuilder', () => {
 
   describe('dealsQuery', () => {
     it('filters by max price', () => {
-      const sql = qb.dealsQuery(50);
+      const sql = qb.dealsQuery({ maxPrice: 50 });
       expect(sql).toContain('<= 50');
       expect(sql).toContain('ORDER BY price ASC');
     });
 
     it('filters by category', () => {
-      const sql = qb.dealsQuery(100, { category: 'tents' });
+      const sql = qb.dealsQuery({ maxPrice: 100, opts: { category: 'tents' } });
       expect(sql).toContain("'%tents%'");
     });
   });
 
   describe('trendsQuery', () => {
     it('generates time-series aggregation', () => {
-      const sql = qb.trendsQuery('tent');
+      const sql = qb.trendsQuery({ keyword: 'tent' });
       expect(sql).toContain('scrape_date');
       expect(sql).toContain('avg_price');
       expect(sql).toContain('observations');
@@ -247,7 +250,7 @@ describe('QueryBuilder', () => {
     });
 
     it('uses custom days parameter', () => {
-      const sql = qb.trendsQuery('tent', { days: 30 });
+      const sql = qb.trendsQuery({ keyword: 'tent', opts: { days: 30 } });
       expect(sql).toContain("INTERVAL '30 days'");
     });
   });
diff --git a/packages/analytics/test/integration/catalog-mode.test.ts b/packages/analytics/test/integration/catalog-mode.test.ts
index 364b126f88..8dcb651c49 100644
--- a/packages/analytics/test/integration/catalog-mode.test.ts
+++ b/packages/analytics/test/integration/catalog-mode.test.ts
@@ -48,7 +48,7 @@ describe.skipIf(!hasCatalogCreds)('catalog mode integration', () => {
     const stats = await cache.getLiveStats();
     if (stats.recordCount === 0) return; // No data published yet
 
-    const results = await cache.search('jacket', { limit: 5 });
+    const results = await cache.search({ keyword: 'jacket', options: { limit: 5 } });
     expect(results.length).toBeGreaterThan(0);
     expect(results[0]).toHaveProperty('name');
     expect(results[0]).toHaveProperty('price');
@@ -77,7 +77,7 @@ describe.skipIf(!hasCatalogCreds)('catalog mode integration', () => {
     const stats = await cache.getLiveStats();
     if (stats.recordCount === 0) return;
 
-    const brands = await cache.getTopBrands(5);
+    const brands = await cache.getTopBrands({ limit: 5 });
     expect(brands.length).toBeGreaterThan(0);
     expect(brands[0]).toHaveProperty('brand');
   });
diff --git a/packages/analytics/test/integration/local-mode.test.ts b/packages/analytics/test/integration/local-mode.test.ts
index 21b728695d..8bd1720a32 100644
--- a/packages/analytics/test/integration/local-mode.test.ts
+++ b/packages/analytics/test/integration/local-mode.test.ts
@@ -51,7 +51,7 @@ describe.skipIf(!canRun)('local mode integration', () => {
   });
 
   it('search returns results for broad keyword', async () => {
-    const results = await cache.search('jacket', { limit: 5 });
+    const results = await cache.search({ keyword: 'jacket', options: { limit: 5 } });
     expect(results.length).toBeGreaterThan(0);
     expect(results[0]).toHaveProperty('name');
     expect(results[0]).toHaveProperty('price');
@@ -59,7 +59,7 @@ describe.skipIf(!canRun)('local mode integration', () => {
   });
 
   it('comparePrices returns site-level aggregates', async () => {
-    const results = await cache.comparePrices('tent');
+    const results = await cache.comparePrices({ keyword: 'tent' });
     if (results.length > 0) {
       expect(results[0]).toHaveProperty('site');
       expect(results[0]).toHaveProperty('avg_price');
@@ -89,7 +89,7 @@ describe.skipIf(!canRun)('local mode integration', () => {
   });
 
   it('getTopBrands returns brand rankings', async () => {
-    const brands = await cache.getTopBrands(5);
+    const brands = await cache.getTopBrands({ limit: 5 });
     expect(brands.length).toBeGreaterThan(0);
     const first = brands[0];
     expect(first).toBeDefined();
@@ -107,7 +107,7 @@ describe.skipIf(!canRun)('local mode integration', () => {
   });
 
   it('findDeals returns items under price threshold', async () => {
-    const deals = await cache.findDeals(50, { limit: 5 });
+    const deals = await cache.findDeals({ maxPrice: 50, options: { limit: 5 } });
     expect(deals.length).toBeGreaterThan(0);
     for (const deal of deals) {
       expect(Number(deal.price)).toBeLessThanOrEqual(50);
@@ -121,19 +121,19 @@ describe.skipIf(!canRun)('local mode integration', () => {
 
     const site = stats.sites[0];
     if (site === undefined) return;
-    const results = await cache.search('gear', { sites: [site], limit: 10 });
+    const results = await cache.search({ keyword: 'gear', options: { sites: [site], limit: 10 } });
     for (const r of results) {
       expect(r.site).toBe(site);
     }
   });
 
   it('analyzeBrand returns category breakdown', async () => {
-    const brands = await cache.getTopBrands(1);
+    const brands = await cache.getTopBrands({ limit: 1 });
     if (brands.length === 0) return;
 
     const firstBrand = brands[0];
     if (firstBrand === undefined) return;
-    const analysis = await cache.analyzeBrand(firstBrand.brand);
+    const analysis = await cache.analyzeBrand({ brandName: firstBrand.brand });
     if (analysis.length > 0) {
       expect(analysis[0]).toHaveProperty('site');
       expect(analysis[0]).toHaveProperty('category');
@@ -142,7 +142,7 @@ describe.skipIf(!canRun)('local mode integration', () => {
   });
 
   it('categoryInsights returns category-level stats', async () => {
-    const results = await cache.categoryInsights('tent');
+    const results = await cache.categoryInsights({ categoryKeyword: 'tent' });
     if (results.length > 0) {
       expect(results[0]).toHaveProperty('site');
       expect(results[0]).toHaveProperty('product_count');
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
index 216c35e93b..4b26e8a063 100644
--- a/packages/api-client/src/index.ts
+++ b/packages/api-client/src/index.ts
@@ -82,7 +82,13 @@ export function createApiClient(config: ApiClientConfig) {
    * refreshes + retries once on a 401 response (unless the 401 came from the
    * refresh endpoint itself, in which case the user must re-auth).
    */
-  const authFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
+  const authFetcher = async ({
+    input,
+    init,
+  }: {
+    input: RequestInfo | URL;
+    init?: RequestInit;
+  }): Promise<Response> => {
     const url = isString(input) ? input : input instanceof URL ? input.toString() : input.url;
     let pathname = '';
     try {
@@ -92,10 +98,13 @@ export function createApiClient(config: ApiClientConfig) {
     }
     const isRefreshPath = pathname === '/api/auth/refresh';
 
-    const buildRequest = (
-      token: string | null,
-      base: RequestInfo | URL,
-    ): [RequestInfo | URL, RequestInit | undefined] => {
+    const buildRequest = ({
+      token,
+      base,
+    }: {
+      token: string | null;
+      base: RequestInfo | URL;
+    }): [RequestInfo | URL, RequestInit | undefined] => {
       if (!token) return [base, init];
       const headers = new Headers();
       const existing = init?.headers;
@@ -127,7 +136,7 @@ export function createApiClient(config: ApiClientConfig) {
     const firstBase = input instanceof Request ? input.clone() : input;
 
     const firstToken = isRefreshPath ? null : await config.auth.getAccessToken();
-    const [firstInput, firstInit] = buildRequest(firstToken, firstBase);
+    const [firstInput, firstInit] = buildRequest({ token: firstToken, base: firstBase });
     const response = await baseFetcher(firstInput, firstInit);
 
     if (response.status !== 401 || isRefreshPath) return response;
@@ -136,7 +145,7 @@ export function createApiClient(config: ApiClientConfig) {
     if (!newToken) return response;
 
     // `input` (the original) was never passed to fetch, so its body is still intact.
-    const [retryInput, retryInit] = buildRequest(newToken, input);
+    const [retryInput, retryInit] = buildRequest({ token: newToken, base: input });
     return baseFetcher(retryInput, retryInit);
   };
 
@@ -151,7 +160,7 @@ export function createApiClient(config: ApiClientConfig) {
   // date-like strings (ISO 8601, "YYYY-MM-DD HH:MM") to Date objects. Without
   // this, every Zod z.string().datetime() field in API response schemas fails.
   return treaty<App>(config.baseUrl, {
-    fetcher: authFetcher as unknown as typeof fetch,
+    fetcher: ((input, init) => authFetcher({ input, init })) as unknown as typeof fetch,
     parseDate: false,
   }).api;
 }
@@ -191,21 +200,24 @@ export class ApiError extends Error {
   readonly status: number;
   readonly body: unknown;
 
-  constructor(message: string, options: ApiErrorOptions) {
+  constructor({ message, status, body }: { message: string; status: number; body: unknown }) {
     super(message);
     this.name = 'ApiError';
-    this.status = options.status;
-    this.body = options.body;
+    this.status = status;
+    this.body = body;
   }
 }
 
 export type QueryParams = Record<string, string | number | boolean | undefined>;
 
 export class PackRatApiClient {
-  constructor(
-    private readonly baseUrl: string,
-    private readonly getAuthToken: () => string,
-  ) {}
+  constructor({ baseUrl, getAuthToken }: { baseUrl: string; getAuthToken: () => string }) {
+    this.baseUrl = baseUrl;
+    this.getAuthToken = getAuthToken;
+  }
+
+  private readonly baseUrl: string;
+  private readonly getAuthToken: () => string;
 
   private get headers(): Record<string, string> {
     const token = this.getAuthToken();
@@ -217,7 +229,7 @@ export class PackRatApiClient {
     return base;
   }
 
-  async get<T = unknown>(path: string, params?: QueryParams): Promise<T> {
+  async get<T = unknown>({ path, params }: { path: string; params?: QueryParams }): Promise<T> {
     const url = new URL(`${this.baseUrl}${path}`);
     if (params) {
       for (const [key, value] of Object.entries(params)) {
@@ -228,7 +240,7 @@ export class PackRatApiClient {
     return this.handleResponse<T>(response);
   }
 
-  async post<T = unknown>(path: string, body?: unknown): Promise<T> {
+  async post<T = unknown>({ path, body }: { path: string; body?: unknown }): Promise<T> {
     const response = await fetch(`${this.baseUrl}${path}`, {
       method: 'POST',
       headers: this.headers,
@@ -237,7 +249,7 @@ export class PackRatApiClient {
     return this.handleResponse<T>(response);
   }
 
-  async put<T = unknown>(path: string, body?: unknown): Promise<T> {
+  async put<T = unknown>({ path, body }: { path: string; body?: unknown }): Promise<T> {
     const response = await fetch(`${this.baseUrl}${path}`, {
       method: 'PUT',
       headers: this.headers,
@@ -246,7 +258,7 @@ export class PackRatApiClient {
     return this.handleResponse<T>(response);
   }
 
-  async patch<T = unknown>(path: string, body?: unknown): Promise<T> {
+  async patch<T = unknown>({ path, body }: { path: string; body?: unknown }): Promise<T> {
     const response = await fetch(`${this.baseUrl}${path}`, {
       method: 'PATCH',
       headers: this.headers,
@@ -255,7 +267,7 @@ export class PackRatApiClient {
     return this.handleResponse<T>(response);
   }
 
-  async delete<T = unknown>(path: string): Promise<T> {
+  async delete<T = unknown>({ path }: { path: string }): Promise<T> {
     const response = await fetch(`${this.baseUrl}${path}`, {
       method: 'DELETE',
       headers: this.headers,
@@ -270,14 +282,20 @@ export class PackRatApiClient {
         isObject(body) && 'error' in body
           ? String((body as Record<string, unknown>).error) // safe-cast: isObject() guard confirms body is a non-null object; error field access is safe
           : `HTTP ${response.status}`;
-      throw new ApiError(errorMessage, { status: response.status, body });
+      throw new ApiError({ message: errorMessage, status: response.status, body });
     }
     return body as T; // safe-cast: caller-provided generic boundary — T is verified at each typed call-site
   }
 }
 
-export function createPackRatClient(baseUrl: string, getAuthToken: () => string): PackRatApiClient {
-  return new PackRatApiClient(baseUrl, getAuthToken);
+export function createPackRatClient({
+  baseUrl,
+  getAuthToken,
+}: {
+  baseUrl: string;
+  getAuthToken: () => string;
+}): PackRatApiClient {
+  return new PackRatApiClient({ baseUrl, getAuthToken });
 }
 
 // ── MCP tool result helpers ───────────────────────────────────────────────────
diff --git a/packages/api/container_src/server.ts b/packages/api/container_src/server.ts
index 2e0c1e8f34..9c149124c4 100644
--- a/packages/api/container_src/server.ts
+++ b/packages/api/container_src/server.ts
@@ -58,10 +58,13 @@ const TikTokImportSchema = z.object({
 /**
  * Detect media content type and file extension from response headers or buffer
  */
-function detectMediaTypeAndExtension(
-  response: Response,
-  opts: { buffer?: ArrayBuffer; isVideo?: boolean } = {},
-): {
+function detectMediaTypeAndExtension({
+  response,
+  opts = {},
+}: {
+  response: Response;
+  opts?: { buffer?: ArrayBuffer; isVideo?: boolean };
+}): {
   contentType: string;
   extension: string;
 } {
@@ -132,10 +135,13 @@ function detectMediaTypeAndExtension(
 /**
  * Download image and rehost to R2 with 5-minute expiration
  */
-async function downloadAndRehostImage(
-  imageUrl: string,
-  opts: { contentId: string; index: number },
-): Promise<string | null> {
+async function downloadAndRehostImage({
+  imageUrl,
+  opts,
+}: {
+  imageUrl: string;
+  opts: { contentId: string; index: number };
+}): Promise<string | null> {
   const { contentId, index } = opts;
   if (!s3Client || !env) {
     console.warn('R2 client not available, skipping image rehosting');
@@ -164,8 +170,11 @@ async function downloadAndRehostImage(
     }
 
     const imageBuffer = await response.arrayBuffer();
-    const { contentType, extension } = detectMediaTypeAndExtension(response, {
-      buffer: imageBuffer,
+    const { contentType, extension } = detectMediaTypeAndExtension({
+      response,
+      opts: {
+        buffer: imageBuffer,
+      },
     });
 
     const timestamp = Date.now();
@@ -224,7 +233,7 @@ async function uploadVideoToGoogle(videoUrl: string): Promise<string | null> {
     });
     console.log(`Video uploaded to Google AI. File URI: ${myfile.uri}, name: ${myfile.name}`);
     if (!myfile.name) throw new Error('Google AI upload did not return a file name');
-    await waitForFileToBeActiveGoogle(googleAi, { fileName: myfile.name });
+    await waitForFileToBeActiveGoogle({ ai: googleAi, opts: { fileName: myfile.name } });
     return myfile.uri || null;
   } catch (error) {
     console.error('Failed to upload video to Google:', error);
@@ -235,10 +244,13 @@ async function uploadVideoToGoogle(videoUrl: string): Promise<string | null> {
 /**
  * Wait for uploaded file to become ACTIVE before using it for inference
  */
-async function waitForFileToBeActiveGoogle(
-  ai: GoogleGenAI,
-  opts: { fileName: string; maxWaitTimeMs?: number },
-): Promise<void> {
+async function waitForFileToBeActiveGoogle({
+  ai,
+  opts,
+}: {
+  ai: GoogleGenAI;
+  opts: { fileName: string; maxWaitTimeMs?: number };
+}): Promise<void> {
   const { fileName, maxWaitTimeMs = 300000 } = opts;
   const startTime = Date.now();
   while (Date.now() - startTime < maxWaitTimeMs) {
@@ -265,10 +277,13 @@ async function waitForFileToBeActiveGoogle(
 /**
  * Download and rehost multiple images with best effort approach
  */
-async function downloadAndRehostImages(
-  imageUrls: string[],
-  contentId: string,
-): Promise<{ rehostedUrls: string[]; failedCount: number; expiresAt: string }> {
+async function downloadAndRehostImages({
+  imageUrls,
+  contentId,
+}: {
+  imageUrls: string[];
+  contentId: string;
+}): Promise<{ rehostedUrls: string[]; failedCount: number; expiresAt: string }> {
   if (!s3Client || !env) {
     console.warn('R2 client not available, returning empty results');
     return {
@@ -281,7 +296,9 @@ async function downloadAndRehostImages(
   console.log(`Starting rehosting of ${imageUrls.length} images`);
 
   const results = await Promise.allSettled(
-    imageUrls.map((url, index) => downloadAndRehostImage(url, { contentId, index })),
+    imageUrls.map((url, index) =>
+      downloadAndRehostImage({ imageUrl: url, opts: { contentId, index } }),
+    ),
   );
 
   const rehostedUrls: string[] = [];
@@ -406,7 +423,10 @@ const app = new Elysia()
 
       const [imageResult, videoResult] = await Promise.allSettled([
         hasImages
-          ? downloadAndRehostImages(fetchedData.imageUrls, fetchedData.contentId || 'unknown')
+          ? downloadAndRehostImages({
+              imageUrls: fetchedData.imageUrls,
+              contentId: fetchedData.contentId || 'unknown',
+            })
           : Promise.resolve({ rehostedUrls: [], failedCount: 0, expiresAt: '' }),
         hasVideo && fetchedData.videoUrl
           ? uploadVideoToGoogle(fetchedData.videoUrl)
diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts
index 8cd0933532..7b2f2c5890 100644
--- a/packages/api/src/auth/index.ts
+++ b/packages/api/src/auth/index.ts
@@ -32,7 +32,7 @@ async function verifyPasswordCompat({
   if (BCRYPT_HASH_RE.test(hash)) {
     return bcrypt.compare(password, hash);
   }
-  return verifyPassword(hash, password);
+  return verifyPassword(password, hash);
 }
 
 // ─── Apple client-secret generation ──────────────────────────────────────────
diff --git a/packages/api/src/db/index.ts b/packages/api/src/db/index.ts
index 4047afb8ec..ef3841ac6d 100644
--- a/packages/api/src/db/index.ts
+++ b/packages/api/src/db/index.ts
@@ -23,7 +23,7 @@ const isStandardPostgresUrl = (url: string) => {
 
 const pgPools = new Map<string, Pool>();
 
-const createConnection = (url: string, useNeonHttp?: boolean) => {
+const createConnection = ({ url, useNeonHttp }: { url: string; useNeonHttp?: boolean }) => {
   if (isStandardPostgresUrl(url)) {
     let pool = pgPools.get(url);
     if (!pool) {
@@ -46,7 +46,7 @@ const createConnection = (url: string, useNeonHttp?: boolean) => {
  */
 export const createDb = () => {
   const { NEON_DATABASE_URL } = getEnv();
-  return createConnection(NEON_DATABASE_URL);
+  return createConnection({ url: NEON_DATABASE_URL });
 };
 
 /**
@@ -54,7 +54,7 @@ export const createDb = () => {
  */
 export const createReadOnlyDb = () => {
   const { NEON_DATABASE_URL_READONLY } = getEnv();
-  return createConnection(NEON_DATABASE_URL_READONLY);
+  return createConnection({ url: NEON_DATABASE_URL_READONLY });
 };
 
 /**
@@ -72,7 +72,7 @@ export const createOsmDb = () => {
       'OSM_DATABASE_URL is not configured — trail features are disabled on this server',
     );
   }
-  return createConnection(OSM_DATABASE_URL);
+  return createConnection({ url: OSM_DATABASE_URL });
 };
 
 /**
@@ -80,5 +80,5 @@ export const createOsmDb = () => {
  * Used from the queue handler which has direct access to the validated env.
  */
 export const createDbClient = (env: ValidatedEnv) => {
-  return createConnection(env.NEON_DATABASE_URL, true);
+  return createConnection({ url: env.NEON_DATABASE_URL, useNeonHttp: true });
 };
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 8b8afb651c..b47b79ebd0 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -117,7 +117,9 @@ export default {
       batch.queue === 'packrat-embeddings-queue-dev'
     ) {
       if (!env.EMBEDDINGS_QUEUE) throw new Error('EMBEDDINGS_QUEUE is not configured');
-      await new CatalogService(env, true).handleEmbeddingsBatch(batch);
+      await new CatalogService({ explicitEnv: env, useHttpDriver: true }).handleEmbeddingsBatch(
+        batch,
+      );
     } else {
       throw new Error(`Unknown queue: ${batch.queue}`);
     }
diff --git a/packages/api/src/middleware/__tests__/cfAccess.test.ts b/packages/api/src/middleware/__tests__/cfAccess.test.ts
index 55daf62b54..bd74d00402 100644
--- a/packages/api/src/middleware/__tests__/cfAccess.test.ts
+++ b/packages/api/src/middleware/__tests__/cfAccess.test.ts
@@ -125,70 +125,70 @@ describe('verifyCFAccessRequest', () => {
 
   it('returns { email } for a valid RS256 JWT with correct iss + aud', async () => {
     const token = await makeCFJwt({ privateKey });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toEqual({ email: 'admin@example.com' });
   });
 
   it('returns null when the cf-access-jwt-assertion header is absent', async () => {
-    const result = await verifyCFAccessRequest(makeRequest(), opts);
+    const result = await verifyCFAccessRequest({ request: makeRequest(), opts });
     expect(result).toBeNull();
   });
 
   it('returns null for a JWT with a wrong audience', async () => {
     const token = await makeCFJwt({ privateKey, aud: 'wrong-audience' });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 
   it('returns null for a JWT with a wrong issuer', async () => {
     const token = await makeCFJwt({ privateKey, iss: 'https://attacker.cloudflareaccess.com' });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 
   it('returns null for a JWT signed by an untrusted key', async () => {
     const token = await makeCFJwt({ privateKey: untrustedPrivateKey });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 
   it('returns null when the JWT payload is missing the email field', async () => {
     const token = await makeCFJwt({ privateKey, omitEmail: true });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 
   it('returns null when the JWT payload has an empty string email', async () => {
     const token = await makeCFJwt({ privateKey, email: '' });
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-jwt-assertion': token }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-jwt-assertion': token }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 
   it('returns null when only CF-Access-Authenticated-User-Email header is present (old spoofable vector)', async () => {
     // The pre-PR code trusted this header directly. The new code requires a
     // cryptographically verified JWT in cf-access-jwt-assertion.
-    const result = await verifyCFAccessRequest(
-      makeRequest({ 'cf-access-authenticated-user-email': 'admin@example.com' }),
+    const result = await verifyCFAccessRequest({
+      request: makeRequest({ 'cf-access-authenticated-user-email': 'admin@example.com' }),
       opts,
-    );
+    });
     expect(result).toBeNull();
   });
 });
diff --git a/packages/api/src/middleware/cfAccess.ts b/packages/api/src/middleware/cfAccess.ts
index f64448411a..9abcf3780d 100644
--- a/packages/api/src/middleware/cfAccess.ts
+++ b/packages/api/src/middleware/cfAccess.ts
@@ -24,10 +24,13 @@ interface CFAccessOptions {
   aud: string;
 }
 
-export async function verifyCFAccessRequest(
-  request: Request,
-  opts: CFAccessOptions,
-): Promise<CFAccessIdentity | null> {
+export async function verifyCFAccessRequest({
+  request,
+  opts,
+}: {
+  request: Request;
+  opts: CFAccessOptions;
+}): Promise<CFAccessIdentity | null> {
   const { teamDomain, aud } = opts;
   const token = request.headers.get('cf-access-jwt-assertion');
   if (!token) return null;
diff --git a/packages/api/src/routes/admin/analytics/platform.ts b/packages/api/src/routes/admin/analytics/platform.ts
index b08da4c1e1..40f9988a66 100644
--- a/packages/api/src/routes/admin/analytics/platform.ts
+++ b/packages/api/src/routes/admin/analytics/platform.ts
@@ -12,7 +12,13 @@ import { and, count, desc, eq, gte, sql } from 'drizzle-orm';
 import { Elysia, status } from 'elysia';
 import { z } from 'zod';
 
-function getStartDate(period: 'day' | 'week' | 'month', range: number): Date {
+function getStartDate({
+  period,
+  range,
+}: {
+  period: 'day' | 'week' | 'month';
+  range: number;
+}): Date {
   const d = new Date();
   if (period === 'day') d.setDate(d.getDate() - range);
   else if (period === 'week') d.setDate(d.getDate() - range * 7);
@@ -35,7 +41,7 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' })
     async ({ query }) => {
       const db = createDb();
       const { period = 'month', range = 12 } = query;
-      const startDate = getStartDate(period, range);
+      const startDate = getStartDate({ period, range });
 
       try {
         const [userGrowth, packGrowth, catalogGrowth] = await Promise.all([
@@ -105,7 +111,7 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' })
     async ({ query }) => {
       const db = createDb();
       const { period = 'month', range = 12 } = query;
-      const startDate = getStartDate(period, range);
+      const startDate = getStartDate({ period, range });
 
       try {
         const [tripActivity, trailActivity, postActivity] = await Promise.all([
diff --git a/packages/api/src/routes/admin/index.ts b/packages/api/src/routes/admin/index.ts
index 1f0ccc82d5..43b131c5b9 100644
--- a/packages/api/src/routes/admin/index.ts
+++ b/packages/api/src/routes/admin/index.ts
@@ -26,10 +26,16 @@ const ADMIN_TOKEN_TTL_SECONDS = 3600; // 1 hour
 const ADMIN_JWT_ISSUER = 'packrat-api';
 const ADMIN_JWT_AUDIENCE = 'packrat-admin';
 
-function checkAdminCredentials(username: string, password: string): boolean {
+function checkAdminCredentials({
+  username,
+  password,
+}: {
+  username: string;
+  password: string;
+}): boolean {
   const env = getEnv();
-  const userOk = timingSafeEqual(username, env.ADMIN_USERNAME);
-  const passOk = timingSafeEqual(password, env.ADMIN_PASSWORD);
+  const userOk = timingSafeEqual({ a: username, b: env.ADMIN_USERNAME });
+  const passOk = timingSafeEqual({ a: password, b: env.ADMIN_PASSWORD });
   return userOk && passOk;
 }
 
@@ -43,7 +49,7 @@ function basicAuthGuard(request: Request): { authorized: true } | { authorized:
     if (sep === -1) return { authorized: false };
     const username = decoded.slice(0, sep);
     const password = decoded.slice(sep + 1);
-    if (checkAdminCredentials(username, password)) return { authorized: true };
+    if (checkAdminCredentials({ username, password })) return { authorized: true };
   } catch {
     return { authorized: false };
   }
@@ -90,9 +96,12 @@ async function adminAuthGuard(request: Request): Promise<boolean> {
 
   // When CF Access is configured, verify the CF JWT injected by the CF edge.
   if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) {
-    const cfIdentity = await verifyCFAccessRequest(request, {
-      teamDomain: CF_ACCESS_TEAM_DOMAIN,
-      aud: CF_ACCESS_AUD,
+    const cfIdentity = await verifyCFAccessRequest({
+      request,
+      opts: {
+        teamDomain: CF_ACCESS_TEAM_DOMAIN,
+        aud: CF_ACCESS_AUD,
+      },
     });
     if (cfIdentity) return true;
   }
@@ -150,13 +159,16 @@ export const adminRoutes = new Elysia({ prefix: '/admin' })
       }
       const { CF_ACCESS_TEAM_DOMAIN, CF_ACCESS_AUD } = env;
       if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) {
-        const cfIdentity = await verifyCFAccessRequest(request, {
-          teamDomain: CF_ACCESS_TEAM_DOMAIN,
-          aud: CF_ACCESS_AUD,
+        const cfIdentity = await verifyCFAccessRequest({
+          request,
+          opts: {
+            teamDomain: CF_ACCESS_TEAM_DOMAIN,
+            aud: CF_ACCESS_AUD,
+          },
         });
         if (!cfIdentity) return status(401, { error: 'CF Access authentication required' });
       }
-      if (!checkAdminCredentials(body.username, body.password)) {
+      if (!checkAdminCredentials({ username: body.username, password: body.password })) {
         return status(401, { error: 'Invalid username or password' });
       }
       const token = await issueAdminJwt(body.username);
@@ -198,9 +210,12 @@ export const adminRoutes = new Elysia({ prefix: '/admin' })
       // travels cross-origin; the CF edge then injects Cf-Access-Jwt-Assertion.
       // Basic credentials are always required and remain the primary gate.
       if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) {
-        const cfIdentity = await verifyCFAccessRequest(request, {
-          teamDomain: CF_ACCESS_TEAM_DOMAIN,
-          aud: CF_ACCESS_AUD,
+        const cfIdentity = await verifyCFAccessRequest({
+          request,
+          opts: {
+            teamDomain: CF_ACCESS_TEAM_DOMAIN,
+            aud: CF_ACCESS_AUD,
+          },
         });
         if (!cfIdentity) return status(401, { error: 'CF Access authentication required' });
       }
@@ -249,7 +264,7 @@ export const adminRoutes = new Elysia({ prefix: '/admin' })
           .where(eq(packs.deleted, false));
         const [itemCount] = await db.select({ count: count() }).from(catalogItems);
 
-        assertAllDefined([userCount, packCount, itemCount]);
+        assertAllDefined({ values: [userCount, packCount, itemCount] });
 
         return {
           users: userCount?.count ?? 0,
diff --git a/packages/api/src/routes/admin/trails.ts b/packages/api/src/routes/admin/trails.ts
index b3a3fb20d1..e7a718e2f7 100644
--- a/packages/api/src/routes/admin/trails.ts
+++ b/packages/api/src/routes/admin/trails.ts
@@ -147,7 +147,7 @@ export const adminTrailsRoutes = new Elysia({ prefix: '/trails' })
           geometry = JSON.parse(row.geojson);
         } else if (row.members && row.members.length > 0) {
           const { stitchRouteGeometry } = await import('@packrat/api/services/trails');
-          geometry = await stitchRouteGeometry(db, row.members);
+          geometry = await stitchRouteGeometry({ db, members: row.members });
         }
 
         return {
diff --git a/packages/api/src/routes/ai/index.ts b/packages/api/src/routes/ai/index.ts
index 80a72a7ea1..1cd909c7f7 100644
--- a/packages/api/src/routes/ai/index.ts
+++ b/packages/api/src/routes/ai/index.ts
@@ -17,7 +17,7 @@ export const aiRoutes = new Elysia({ prefix: '/ai' })
       try {
         const { q, limit } = query;
         const aiService = new AIService();
-        const result = await aiService.searchPackratOutdoorGuidesRAG(q, limit);
+        const result = await aiService.searchPackratOutdoorGuidesRAG({ query: q, limit });
         return result;
       } catch (error) {
         console.error('RAG search error:', error);
diff --git a/packages/api/src/routes/alltrails.ts b/packages/api/src/routes/alltrails.ts
index 98a9e97a4a..7989fe5145 100644
--- a/packages/api/src/routes/alltrails.ts
+++ b/packages/api/src/routes/alltrails.ts
@@ -4,7 +4,7 @@ import { z } from 'zod';
 const ALLTRAILS_HOSTNAME_RE = /^(?:[a-z0-9-]+\.)?alltrails\.com$/;
 const UA = 'Mozilla/5.0 (compatible; PackRat/1.0; +https://packrat.world)';
 
-function extractOgTag(html: string, property: string): string | null {
+function extractOgTag({ html, property }: { html: string; property: string }): string | null {
   const match =
     html.match(
       new RegExp(`<meta[^>]+property=["']${property}["'][^>]+content=["']([^"']+)["']`, 'i'),
@@ -92,13 +92,13 @@ export const alltrailsRoutes = new Elysia({ prefix: '/alltrails' }).post(
 
     const html = await response.text();
 
-    const title = extractOgTag(html, 'og:title');
+    const title = extractOgTag({ html, property: 'og:title' });
     if (!title) {
       return status(422, { error: 'No og:title found in AllTrails page' });
     }
 
-    const description = extractOgTag(html, 'og:description');
-    const image = extractOgTag(html, 'og:image');
+    const description = extractOgTag({ html, property: 'og:description' });
+    const image = extractOgTag({ html, property: 'og:image' });
 
     return { title, description, image, url: response.url || url };
   },
diff --git a/packages/api/src/routes/catalog/index.ts b/packages/api/src/routes/catalog/index.ts
index 442a43fb95..44ea14d9d1 100644
--- a/packages/api/src/routes/catalog/index.ts
+++ b/packages/api/src/routes/catalog/index.ts
@@ -95,7 +95,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' })
       try {
         const { q: searchQuery, limit = 10, offset = 0 } = query;
         const catalogService = new CatalogService();
-        return await catalogService.vectorSearch(searchQuery, { limit, offset });
+        return await catalogService.vectorSearch({ q: searchQuery, opts: { limit, offset } });
       } catch (error) {
         console.error('Vector search error:', error);
         return status(500, { error: 'Failed to search catalog items' });
@@ -170,10 +170,13 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' })
         });
       }
 
-      const rank = <K extends keyof (typeof items)[number]>(
-        key: K,
-        order: 'asc' | 'desc',
-      ): number | null => {
+      const rank = <K extends keyof (typeof items)[number]>({
+        key,
+        order,
+      }: {
+        key: K;
+        order: 'asc' | 'desc';
+      }): number | null => {
         const ranked = [...items]
           .filter((it) => it[key] != null)
           .sort((a, b) => {
@@ -186,9 +189,9 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' })
 
       return {
         items,
-        lightestId: rank('weight', 'asc'),
-        cheapestId: rank('price', 'asc'),
-        highestRatedId: rank('ratingValue', 'desc'),
+        lightestId: rank({ key: 'weight', order: 'asc' }),
+        cheapestId: rank({ key: 'price', order: 'asc' }),
+        highestRatedId: rank({ key: 'ratingValue', order: 'desc' }),
       };
     },
     {
@@ -320,7 +323,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' })
         throw new Error('Service unavailable: OpenAI API key not configured');
       }
 
-      const embeddingText = getEmbeddingText(data);
+      const embeddingText = getEmbeddingText({ item: data });
       const embedding = await generateEmbedding({
         openAiApiKey: OPENAI_API_KEY,
         value: embeddingText,
@@ -517,8 +520,8 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' })
       }
 
       let embedding: number[] | null = null;
-      const newEmbeddingText = getEmbeddingText(data, existingItem);
-      const oldEmbeddingText = getEmbeddingText(existingItem);
+      const newEmbeddingText = getEmbeddingText({ item: data, existingItem });
+      const oldEmbeddingText = getEmbeddingText({ item: existingItem });
 
       if (newEmbeddingText !== oldEmbeddingText) {
         embedding = await generateEmbedding({
diff --git a/packages/api/src/routes/packTemplates/index.ts b/packages/api/src/routes/packTemplates/index.ts
index 2494f6d6f2..0d70d7ba52 100644
--- a/packages/api/src/routes/packTemplates/index.ts
+++ b/packages/api/src/routes/packTemplates/index.ts
@@ -300,7 +300,7 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' })
 
         const batchResult =
           searchQueries.length > 0
-            ? await catalogService.batchVectorSearch(searchQueries, 1)
+            ? await catalogService.batchVectorSearch({ queries: searchQueries, limit: 1 })
             : { items: [] as never[] };
 
         const now = new Date();
diff --git a/packages/api/src/routes/packs/index.ts b/packages/api/src/routes/packs/index.ts
index 4fe6e10e3f..cba9bb4dc5 100644
--- a/packages/api/src/routes/packs/index.ts
+++ b/packages/api/src/routes/packs/index.ts
@@ -70,7 +70,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
         },
       });
 
-      return z.array(PackWithWeightsSchema).parse(computePacksWeights(result));
+      return z.array(PackWithWeightsSchema).parse(computePacksWeights({ packs: result }));
     },
     {
       query: z.object({
@@ -111,7 +111,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
       if (!newPack) return status(500, { error: 'Failed to create pack' });
 
       const packWithItems: PackWithItems = { ...newPack, items: [] };
-      return PackWithWeightsSchema.parse(computePackWeights(packWithItems));
+      return PackWithWeightsSchema.parse(computePackWeights({ pack: packWithItems }));
     },
     {
       body: CreatePackBodySchema,
@@ -189,7 +189,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
         });
 
         const imageDetectionService = new ImageDetectionService();
-        const result = await imageDetectionService.detectAndMatchItems(imageUrl, matchLimit);
+        const result = await imageDetectionService.detectAndMatchItems({ imageUrl, matchLimit });
 
         await PACKRAT_BUCKET.delete(image);
 
@@ -231,7 +231,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
       });
 
       if (!pack) throw new NotFoundError('Pack not found');
-      return PackWithWeightsSchema.parse(computePackWeights(pack));
+      return PackWithWeightsSchema.parse(computePackWeights({ pack }));
     },
     {
       params: z.object({ packId: z.string() }),
@@ -306,7 +306,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
         });
 
         if (!updatedPack) return status(404, { error: 'Pack not found' });
-        return computePackWeights(updatedPack);
+        return computePackWeights({ pack: updatedPack });
       } catch (error) {
         console.error('Error updating pack:', error);
         return status(500, { error: 'Failed to update pack' });
@@ -458,7 +458,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' })
         const packDetails = await getPackDetails({ packId: params.packId });
         if (!packDetails) return status(404, { error: 'Pack not found' });
 
-        const pack = computePackWeights(packDetails);
+        const pack = computePackWeights({ pack: packDetails });
 
         if (pack.userId !== user.userId) {
           return status(403, { error: 'Forbidden' });
@@ -633,7 +633,7 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s
       if (!OPENAI_API_KEY) return status(400, { error: 'OpenAI API key not configured' });
       const itemId = data.id;
 
-      const embeddingText = getEmbeddingText(data);
+      const embeddingText = getEmbeddingText({ item: data });
       const embedding = await generateEmbedding({
         openAiApiKey: OPENAI_API_KEY,
         value: embeddingText,
@@ -735,8 +735,8 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s
 
       if (!existingItem) throw new NotFoundError('Pack item not found');
 
-      const newEmbeddingText = getEmbeddingText(data, existingItem);
-      const oldEmbeddingText = getEmbeddingText(existingItem);
+      const newEmbeddingText = getEmbeddingText({ item: data, existingItem });
+      const oldEmbeddingText = getEmbeddingText({ item: existingItem });
 
       const updateData: Partial<typeof packItems.$inferInsert> = {};
       if ('name' in data) updateData.name = data.name;
diff --git a/packages/api/src/routes/trails/index.ts b/packages/api/src/routes/trails/index.ts
index b33e7a721c..72e2a56ee5 100644
--- a/packages/api/src/routes/trails/index.ts
+++ b/packages/api/src/routes/trails/index.ts
@@ -154,7 +154,7 @@ export const trailsRoutes = new Elysia({ prefix: '/trails' })
         if (row.geojson) {
           geometry = JSON.parse(row.geojson);
         } else if (row.members && row.members.length > 0) {
-          geometry = await stitchRouteGeometry(db, row.members);
+          geometry = await stitchRouteGeometry({ db, members: row.members });
         }
 
         return {
diff --git a/packages/api/src/services/aiService.ts b/packages/api/src/services/aiService.ts
index c2093f2bce..f702773192 100644
--- a/packages/api/src/services/aiService.ts
+++ b/packages/api/src/services/aiService.ts
@@ -44,10 +44,13 @@ export class AIService {
     }
   }
 
-  async searchPackratOutdoorGuidesRAG(
-    query: string,
-    limit: number = 5,
-  ): Promise<
+  async searchPackratOutdoorGuidesRAG({
+    query,
+    limit = 5,
+  }: {
+    query: string;
+    limit?: number;
+  }): Promise<
     Omit<AutoRagSearchResponse, 'data'> & {
       data: (AutoRagSearchResponse['data'][0] & { url: string })[];
     }
diff --git a/packages/api/src/services/catalogService.ts b/packages/api/src/services/catalogService.ts
index 30d5c9c96b..a78d51d4fb 100644
--- a/packages/api/src/services/catalogService.ts
+++ b/packages/api/src/services/catalogService.ts
@@ -32,11 +32,14 @@ export class CatalogService {
 
   /**
    * - `new CatalogService()` – reads the isolate-level env (Elysia routes).
-   * - `new CatalogService(env, true)` – queue handler path: caller passes the
-   *   raw validated env, and we use the HTTP-only Neon driver (which is
+   * - `new CatalogService({ explicitEnv, useHttpDriver: true })` – queue handler path: caller
+   *   passes the raw validated env, and we use the HTTP-only Neon driver (which is
    *   better suited for short-lived queue workers).
    */
-  constructor(explicitEnv?: Env, useHttpDriver: boolean = false) {
+  constructor({
+    explicitEnv,
+    useHttpDriver = false,
+  }: { explicitEnv?: Env; useHttpDriver?: boolean } = {}) {
     if (explicitEnv && useHttpDriver) {
       this.env = explicitEnv;
       this.db = createDbClient(explicitEnv);
@@ -190,10 +193,13 @@ export class CatalogService {
     };
   }
 
-  async vectorSearch(
-    q: string,
-    opts: { limit?: number; offset?: number } = {},
-  ): Promise<{
+  async vectorSearch({
+    q,
+    opts = {},
+  }: {
+    q: string;
+    opts?: { limit?: number; offset?: number };
+  }): Promise<{
     items: (Omit<CatalogItem, 'embedding'> & { similarity: number })[];
     total: number;
     limit: number;
@@ -263,10 +269,7 @@ export class CatalogService {
     };
   }
 
-  async batchVectorSearch(
-    queries: string[],
-    limit: number = 5,
-  ): Promise<{
+  async batchVectorSearch({ queries, limit = 5 }: { queries: string[]; limit?: number }): Promise<{
     items: (Omit<CatalogItem, 'embedding'> & { similarity: number })[][];
   }> {
     if (!queries || queries.length === 0) {
@@ -382,7 +385,7 @@ export class CatalogService {
 
     if (itemsToUpdate.length > 0) {
       // Regenerate embeddings for updated items
-      const embeddingTexts = itemsToUpdate.map((item) => getEmbeddingText(item));
+      const embeddingTexts = itemsToUpdate.map((item) => getEmbeddingText({ item }));
       const embeddings = await generateManyEmbeddings({
         openAiApiKey: this.env.OPENAI_API_KEY,
         values: embeddingTexts,
@@ -406,7 +409,13 @@ export class CatalogService {
     return upsertedItems;
   }
 
-  async trackEtlJob(itemIds: Pick<CatalogItem, 'id'>[], jobId: string): Promise<void> {
+  async trackEtlJob({
+    itemIds,
+    jobId,
+  }: {
+    itemIds: Pick<CatalogItem, 'id'>[];
+    jobId: string;
+  }): Promise<void> {
     await this.db.insert(catalogItemEtlJobs).values(
       itemIds.map((item) => ({
         catalogItemId: item.id,
@@ -473,7 +482,7 @@ export class CatalogService {
       );
 
     // Prepare texts for batch embedding
-    const embeddingTexts = itemsToEmbed.map((item) => getEmbeddingText(item));
+    const embeddingTexts = itemsToEmbed.map((item) => getEmbeddingText({ item }));
 
     try {
       // Generate embeddings in batch
diff --git a/packages/api/src/services/etl/processLogsBatch.ts b/packages/api/src/services/etl/processLogsBatch.ts
index cfab66517a..f8e7868107 100644
--- a/packages/api/src/services/etl/processLogsBatch.ts
+++ b/packages/api/src/services/etl/processLogsBatch.ts
@@ -15,10 +15,13 @@ export async function processLogsBatch({
   const db = createDbClient(env);
   try {
     await db.insert(invalidItemLogs).values(logs);
-    await updateEtlJobProgress(env, {
-      jobId,
-      invalid: logs.length,
-      processed: logs.length,
+    await updateEtlJobProgress({
+      env,
+      params: {
+        jobId,
+        invalid: logs.length,
+        processed: logs.length,
+      },
     });
 
     console.log(`📝 Processed and wrote ${logs.length} invalid items for job ${jobId}`);
diff --git a/packages/api/src/services/etl/processValidItemsBatch.ts b/packages/api/src/services/etl/processValidItemsBatch.ts
index 354d777c10..c329407e6c 100644
--- a/packages/api/src/services/etl/processValidItemsBatch.ts
+++ b/packages/api/src/services/etl/processValidItemsBatch.ts
@@ -15,12 +15,12 @@ export async function processValidItemsBatch({
   items: Partial<NewCatalogItem>[];
   env: Env;
 }): Promise<void> {
-  const catalogService = new CatalogService(env, true);
+  const catalogService = new CatalogService({ explicitEnv: env, useHttpDriver: true });
 
   const mergedItems = mergeItemsBySku(items as NewCatalogItem[]); // safe-cast: items are Partial<NewCatalogItem> at the type level, but all required fields have been confirmed present by CatalogItemValidator before reaching here
 
   // Prepare texts for batch embedding
-  const embeddingTexts = mergedItems.map((item) => getEmbeddingText(item));
+  const embeddingTexts = mergedItems.map((item) => getEmbeddingText({ item }));
 
   try {
     // Generate embeddings in batch
@@ -41,23 +41,29 @@ export async function processValidItemsBatch({
 
     const upsertedItems = await catalogService.upsertCatalogItems(itemsWithEmbeddings);
     // Track the ETL job that processed these items
-    await catalogService.trackEtlJob(upsertedItems, jobId);
+    await catalogService.trackEtlJob({ itemIds: upsertedItems, jobId });
     // Update the ETL job progress — processed is incremented atomically with valid to prevent
     // totalValid > totalProcessed if the Worker dies between two separate DB updates.
-    await updateEtlJobProgress(env, {
-      jobId,
-      valid: items.length,
-      processed: items.length,
+    await updateEtlJobProgress({
+      env,
+      params: {
+        jobId,
+        valid: items.length,
+        processed: items.length,
+      },
     });
   } catch (error) {
     console.error(`Error generating embeddings for batch ${jobId}:`, error);
     // Fall back to processing without embeddings
     const upsertedItems = await catalogService.upsertCatalogItems(mergedItems);
-    await catalogService.trackEtlJob(upsertedItems, jobId);
-    await updateEtlJobProgress(env, {
-      jobId,
-      valid: items.length,
-      processed: items.length,
+    await catalogService.trackEtlJob({ itemIds: upsertedItems, jobId });
+    await updateEtlJobProgress({
+      env,
+      params: {
+        jobId,
+        valid: items.length,
+        processed: items.length,
+      },
     });
   } finally {
     console.log(`📦 Batch ${jobId}: Processed ${items.length} valid items`);
diff --git a/packages/api/src/services/etl/updateEtlJobProgress.ts b/packages/api/src/services/etl/updateEtlJobProgress.ts
index 2f1d3257c2..b4089432b0 100644
--- a/packages/api/src/services/etl/updateEtlJobProgress.ts
+++ b/packages/api/src/services/etl/updateEtlJobProgress.ts
@@ -3,10 +3,13 @@ import type { Env } from '@packrat/api/utils/env-validation';
 import { etlJobs } from '@packrat/db';
 import { eq, sql } from 'drizzle-orm';
 
-export async function updateEtlJobProgress(
-  env: Env,
-  params: { jobId: string; valid?: number; invalid?: number; processed?: number },
-): Promise<void> {
+export async function updateEtlJobProgress({
+  env,
+  params,
+}: {
+  env: Env;
+  params: { jobId: string; valid?: number; invalid?: number; processed?: number };
+}): Promise<void> {
   const db = createDbClient(env);
 
   const valid = params?.valid ?? 0;
diff --git a/packages/api/src/services/imageDetectionService.ts b/packages/api/src/services/imageDetectionService.ts
index 628207da61..ac7c231aa9 100644
--- a/packages/api/src/services/imageDetectionService.ts
+++ b/packages/api/src/services/imageDetectionService.ts
@@ -83,10 +83,13 @@ export class ImageDetectionService {
    * Detect items in an image and find matching catalog items
    */
 
-  async detectAndMatchItems(
-    imageUrl: string,
-    matchLimit: number = 3,
-  ): Promise<DetectedItemWithMatches[]> {
+  async detectAndMatchItems({
+    imageUrl,
+    matchLimit = 3,
+  }: {
+    imageUrl: string;
+    matchLimit?: number;
+  }): Promise<DetectedItemWithMatches[]> {
     try {
       // First, detect items in the image
       const analysis = await this.analyzeImage(imageUrl);
@@ -105,7 +108,10 @@ export class ImageDetectionService {
       const searchQueries = highConfidenceItems.map((detected) =>
         `${detected.name} ${detected.description}`.trim(),
       );
-      const result = await catalogService.batchVectorSearch(searchQueries, matchLimit);
+      const result = await catalogService.batchVectorSearch({
+        queries: searchQueries,
+        limit: matchLimit,
+      });
 
       // Combine detected items with their catalog matches
       const itemsWithMatches: DetectedItemWithMatches[] = highConfidenceItems
diff --git a/packages/api/src/services/packService.ts b/packages/api/src/services/packService.ts
index f7c9cd260f..2a192b5810 100644
--- a/packages/api/src/services/packService.ts
+++ b/packages/api/src/services/packService.ts
@@ -55,7 +55,7 @@ export class PackService {
     });
 
     if (!pack) return null;
-    return computePackWeights(pack);
+    return computePackWeights({ pack });
   }
 
   async generatePacks(count: number) {
@@ -129,10 +129,10 @@ export class PackService {
     packItemConcepts: PackItemConceptSchema[],
   ): Promise<Omit<NewPackItem, 'id' | 'userId' | 'packId'>[]> {
     const catalogService = new CatalogService();
-    const searchResults = await catalogService.batchVectorSearch(
-      packItemConcepts.map((item) => item.item),
-      1,
-    );
+    const searchResults = await catalogService.batchVectorSearch({
+      queries: packItemConcepts.map((item) => item.item),
+      limit: 1,
+    });
 
     return packItemConcepts
       .map((item, idx) => {
diff --git a/packages/api/src/services/passwordResetService.ts b/packages/api/src/services/passwordResetService.ts
index cae2003ba6..a71087435d 100644
--- a/packages/api/src/services/passwordResetService.ts
+++ b/packages/api/src/services/passwordResetService.ts
@@ -53,7 +53,7 @@ export async function verifyOtpAndResetPassword({
     where: and(eq(verification.identifier, identifier), gt(verification.expiresAt, new Date())),
   });
 
-  if (!record || !timingSafeEqual(record.value, code)) {
+  if (!record || !timingSafeEqual({ a: record.value, b: code })) {
     throw new Error('Invalid or expired reset code');
   }
 
diff --git a/packages/api/src/services/trails.ts b/packages/api/src/services/trails.ts
index 6841220d35..8b0709b433 100644
--- a/packages/api/src/services/trails.ts
+++ b/packages/api/src/services/trails.ts
@@ -16,10 +16,13 @@ export type { OsmMember };
  * will return null for those routes. This only affects the rare null-geometry
  * fallback path — osm2pgsql assembles geometry for >99% of routes directly.
  */
-export async function stitchRouteGeometry(
-  db: ReturnType<typeof createOsmDb>,
-  members: OsmMember[],
-): Promise<unknown> {
+export async function stitchRouteGeometry({
+  db,
+  members,
+}: {
+  db: ReturnType<typeof createOsmDb>;
+  members: OsmMember[];
+}): Promise<unknown> {
   const wayRefs = members.filter((m) => m.type === 'w').map((m) => m.ref);
   if (wayRefs.length === 0) return null;
 
diff --git a/packages/api/src/utils/__tests__/auth.test.ts b/packages/api/src/utils/__tests__/auth.test.ts
index 3043193d01..f8c8b16b11 100644
--- a/packages/api/src/utils/__tests__/auth.test.ts
+++ b/packages/api/src/utils/__tests__/auth.test.ts
@@ -22,11 +22,13 @@ describe('auth utilities', () => {
     });
 
     it('verifies a matching password', async () => {
-      expect(await verifyPassword('password123', 'hashed_password123')).toBe(true);
+      expect(await verifyPassword({ password: 'password123', hash: 'hashed_password123' })).toBe(
+        true,
+      );
     });
 
     it('rejects a non-matching password', async () => {
-      expect(await verifyPassword('password123', 'hashed_wrong')).toBe(false);
+      expect(await verifyPassword({ password: 'password123', hash: 'hashed_wrong' })).toBe(false);
     });
   });
 
diff --git a/packages/api/src/utils/__tests__/chatContextHelpers.test.ts b/packages/api/src/utils/__tests__/chatContextHelpers.test.ts
index 7a59c597b0..db0d11d067 100644
--- a/packages/api/src/utils/__tests__/chatContextHelpers.test.ts
+++ b/packages/api/src/utils/__tests__/chatContextHelpers.test.ts
@@ -7,28 +7,39 @@ import {
 
 describe('generatePromptWithContext', () => {
   it('returns the raw message when no context is provided', () => {
-    expect(generatePromptWithContext('Hello')).toBe('Hello');
+    expect(generatePromptWithContext({ userMessage: 'Hello' })).toBe('Hello');
   });
 
   it('returns the raw message for a general context', () => {
-    expect(generatePromptWithContext('Hello', { contextType: 'general' })).toBe('Hello');
+    expect(
+      generatePromptWithContext({ userMessage: 'Hello', context: { contextType: 'general' } }),
+    ).toBe('Hello');
   });
 
   it('prefixes message with item name for item context', () => {
-    const result = generatePromptWithContext('Tell me more', {
-      contextType: 'item',
-      itemName: 'Tent',
+    const result = generatePromptWithContext({
+      userMessage: 'Tell me more',
+      context: {
+        contextType: 'item',
+        itemName: 'Tent',
+      },
     });
     expect(result).toBe('[About item: Tent] Tell me more');
   });
 
   it('returns raw message for item context without an item name', () => {
-    const result = generatePromptWithContext('Tell me more', { contextType: 'item' });
+    const result = generatePromptWithContext({
+      userMessage: 'Tell me more',
+      context: { contextType: 'item' },
+    });
     expect(result).toBe('Tell me more');
   });
 
   it('prefixes message for pack context', () => {
-    const result = generatePromptWithContext('Analyze my pack', { contextType: 'pack' });
+    const result = generatePromptWithContext({
+      userMessage: 'Analyze my pack',
+      context: { contextType: 'pack' },
+    });
     expect(result).toBe('[About my pack] Analyze my pack');
   });
 });
diff --git a/packages/api/src/utils/__tests__/compute-pack.test.ts b/packages/api/src/utils/__tests__/compute-pack.test.ts
index b3b379fc94..bd25ff6b0a 100644
--- a/packages/api/src/utils/__tests__/compute-pack.test.ts
+++ b/packages/api/src/utils/__tests__/compute-pack.test.ts
@@ -59,7 +59,7 @@ function makePackItem(
 describe('computePackWeights', () => {
   it('returns zero base and total weight for an empty pack', () => {
     const pack = makePack({ items: [] });
-    const result = computePackWeights(pack);
+    const result = computePackWeights({ pack });
     expect(result.baseWeight).toBe(0);
     expect(result.totalWeight).toBe(0);
   });
@@ -67,7 +67,7 @@ describe('computePackWeights', () => {
   it('throws when items is null/undefined', () => {
     // Force the missing-items scenario by casting to bypass TS
     const pack = makePack({ items: undefined as unknown as PackItem[] });
-    expect(() => computePackWeights(pack)).toThrow(`Pack with ID pack-1 has no items`);
+    expect(() => computePackWeights({ pack })).toThrow(`Pack with ID pack-1 has no items`);
   });
 
   it('calculates correct base and total weight in grams', () => {
@@ -75,7 +75,7 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g' }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack({ items }));
+    const result = computePackWeights({ pack: makePack({ items }) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(300);
   });
@@ -85,7 +85,7 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', consumable: true }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack({ items }));
+    const result = computePackWeights({ pack: makePack({ items }) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(100);
   });
@@ -95,14 +95,14 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', worn: true }),
       makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }),
     ];
-    const result = computePackWeights(makePack({ items }));
+    const result = computePackWeights({ pack: makePack({ items }) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(100);
   });
 
   it('multiplies weight by item quantity', () => {
     const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 3 })];
-    const result = computePackWeights(makePack({ items }));
+    const result = computePackWeights({ pack: makePack({ items }) });
     expect(result.totalWeight).toBe(300);
     expect(result.baseWeight).toBe(300);
   });
@@ -112,26 +112,26 @@ describe('computePackWeights', () => {
       makePackItem({ id: 'i1', weight: 1, weightUnit: 'kg' }), // 1000 g
       makePackItem({ id: 'i2', weight: 1000, weightUnit: 'g' }), // 1000 g
     ];
-    const result = computePackWeights(makePack({ items }));
+    const result = computePackWeights({ pack: makePack({ items }) });
     expect(result.totalWeight).toBe(2000);
     expect(result.baseWeight).toBe(2000);
   });
 
   it('respects the preferredUnit parameter (oz)', () => {
     const items = [makePackItem({ weight: 28.35, weightUnit: 'g' })];
-    const result = computePackWeights(makePack({ items }), 'oz');
+    const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'oz' });
     expect(result.totalWeight).toBeCloseTo(1, 1);
   });
 
   it('respects the preferredUnit parameter (kg)', () => {
     const items = [makePackItem({ weight: 1000, weightUnit: 'g' })];
-    const result = computePackWeights(makePack({ items }), 'kg');
+    const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'kg' });
     expect(result.totalWeight).toBe(1);
   });
 
   it('preserves all other pack properties', () => {
     const pack = makePack({ name: 'My Pack', category: 'backpacking', items: [] });
-    const result = computePackWeights(pack);
+    const result = computePackWeights({ pack });
     expect(result.name).toBe('My Pack');
     expect(result.category).toBe('backpacking');
   });
@@ -139,7 +139,7 @@ describe('computePackWeights', () => {
   it('rounds computed weights to 2 decimal places', () => {
     // 100g in oz = 3.527... rounded to 2 decimals
     const items = [makePackItem({ weight: 100, weightUnit: 'g' })];
-    const result = computePackWeights(makePack({ items }), 'oz');
+    const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'oz' });
     const decimals = result.totalWeight.toString().split('.')[1];
     expect(decimals === undefined || decimals.length <= 2).toBe(true);
   });
@@ -150,7 +150,7 @@ describe('computePackWeights', () => {
 // ---------------------------------------------------------------------------
 describe('computePacksWeights', () => {
   it('returns an empty array for no packs', () => {
-    expect(computePacksWeights([])).toEqual([]);
+    expect(computePacksWeights({ packs: [] })).toEqual([]);
   });
 
   it('computes weights for multiple packs', () => {
@@ -164,7 +164,7 @@ describe('computePacksWeights', () => {
         items: [makePackItem({ weight: 1000, weightUnit: 'g' })],
       }),
     ];
-    const results = computePacksWeights(packs);
+    const results = computePacksWeights({ packs });
     expect(results[0]?.totalWeight).toBe(500);
     expect(results[1]?.totalWeight).toBe(1000);
   });
diff --git a/packages/api/src/utils/__tests__/csv-utils.test.ts b/packages/api/src/utils/__tests__/csv-utils.test.ts
index 14aa053104..a9eef86948 100644
--- a/packages/api/src/utils/__tests__/csv-utils.test.ts
+++ b/packages/api/src/utils/__tests__/csv-utils.test.ts
@@ -419,38 +419,41 @@ describe('csv-utils', () => {
 
   describe('parseWeight', () => {
     it('parses grams correctly', () => {
-      expect(parseWeight('100')).toEqual({ weight: 100, unit: 'g' });
-      expect(parseWeight('150', 'g')).toEqual({ weight: 150, unit: 'g' });
+      expect(parseWeight({ weightStr: '100' })).toEqual({ weight: 100, unit: 'g' });
+      expect(parseWeight({ weightStr: '150', unitStr: 'g' })).toEqual({ weight: 150, unit: 'g' });
     });
 
     it('parses ounces correctly', () => {
-      expect(parseWeight('10', 'oz')).toEqual({ weight: 284, unit: 'oz' });
-      expect(parseWeight('5 oz')).toEqual({ weight: 142, unit: 'oz' });
+      expect(parseWeight({ weightStr: '10', unitStr: 'oz' })).toEqual({ weight: 284, unit: 'oz' });
+      expect(parseWeight({ weightStr: '5 oz' })).toEqual({ weight: 142, unit: 'oz' });
     });
 
     it('parses pounds correctly', () => {
-      expect(parseWeight('2', 'lb')).toEqual({ weight: 907, unit: 'lb' });
-      expect(parseWeight('3 lbs')).toEqual({ weight: 1361, unit: 'lb' });
+      expect(parseWeight({ weightStr: '2', unitStr: 'lb' })).toEqual({ weight: 907, unit: 'lb' });
+      expect(parseWeight({ weightStr: '3 lbs' })).toEqual({ weight: 1361, unit: 'lb' });
     });
 
     it('parses kilograms correctly', () => {
-      expect(parseWeight('1.5', 'kg')).toEqual({ weight: 1500, unit: 'kg' });
-      expect(parseWeight('2 kg')).toEqual({ weight: 2000, unit: 'kg' });
+      expect(parseWeight({ weightStr: '1.5', unitStr: 'kg' })).toEqual({
+        weight: 1500,
+        unit: 'kg',
+      });
+      expect(parseWeight({ weightStr: '2 kg' })).toEqual({ weight: 2000, unit: 'kg' });
     });
 
     it('handles empty or invalid input', () => {
-      expect(parseWeight('')).toEqual({ weight: null, unit: null });
-      expect(parseWeight('invalid')).toEqual({ weight: null, unit: null });
-      expect(parseWeight('-10')).toEqual({ weight: null, unit: null });
+      expect(parseWeight({ weightStr: '' })).toEqual({ weight: null, unit: null });
+      expect(parseWeight({ weightStr: 'invalid' })).toEqual({ weight: null, unit: null });
+      expect(parseWeight({ weightStr: '-10' })).toEqual({ weight: null, unit: null });
     });
 
     it('defaults to grams when no unit is specified', () => {
-      expect(parseWeight('250')).toEqual({ weight: 250, unit: 'g' });
+      expect(parseWeight({ weightStr: '250' })).toEqual({ weight: 250, unit: 'g' });
     });
 
     it('is case-insensitive for units', () => {
-      expect(parseWeight('10', 'OZ')).toEqual({ weight: 284, unit: 'oz' });
-      expect(parseWeight('1', 'KG')).toEqual({ weight: 1000, unit: 'kg' });
+      expect(parseWeight({ weightStr: '10', unitStr: 'OZ' })).toEqual({ weight: 284, unit: 'oz' });
+      expect(parseWeight({ weightStr: '1', unitStr: 'KG' })).toEqual({ weight: 1000, unit: 'kg' });
     });
   });
 
diff --git a/packages/api/src/utils/__tests__/embeddingHelper.test.ts b/packages/api/src/utils/__tests__/embeddingHelper.test.ts
index a59329979a..f04367ba62 100644
--- a/packages/api/src/utils/__tests__/embeddingHelper.test.ts
+++ b/packages/api/src/utils/__tests__/embeddingHelper.test.ts
@@ -14,7 +14,7 @@ describe('embeddingHelper', () => {
         model: 'Pro 2000',
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Test Tent');
       expect(result).toContain('A great tent for camping');
@@ -28,7 +28,7 @@ describe('embeddingHelper', () => {
         categories: ['camping', 'backpacking', 'cold-weather'],
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('camping, backpacking, cold-weather');
     });
@@ -39,7 +39,7 @@ describe('embeddingHelper', () => {
         category: 'water-treatment',
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('water-treatment');
     });
@@ -53,7 +53,7 @@ describe('embeddingHelper', () => {
         ],
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Size: S, M, L');
       expect(result).toContain('Color: Red, Blue');
@@ -69,7 +69,7 @@ describe('embeddingHelper', () => {
         },
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Battery Life: 20 hours');
       expect(result).toContain('Waterproof: IPX7');
@@ -84,7 +84,7 @@ describe('embeddingHelper', () => {
         material: 'Ripstop Nylon',
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Green');
       expect(result).toContain('50L');
@@ -100,7 +100,7 @@ describe('embeddingHelper', () => {
         ],
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Great boots Very comfortable and durable');
       expect(result).toContain('Perfect fit Excellent traction on trails');
@@ -117,7 +117,7 @@ describe('embeddingHelper', () => {
         ],
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('What fuel does it use?');
       expect(result).toContain('Propane or butane');
@@ -133,7 +133,7 @@ describe('embeddingHelper', () => {
         ],
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toContain('Is it dishwasher safe? Yes, top rack only');
       expect(result).toContain('What is the capacity? 1 liter');
@@ -147,7 +147,7 @@ describe('embeddingHelper', () => {
         model: '',
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
 
       expect(result).toBe('Item');
     });
@@ -164,7 +164,7 @@ describe('embeddingHelper', () => {
         categories: ['outdoor', 'gear'],
       };
 
-      const result = getEmbeddingText(item, existingItem);
+      const result = getEmbeddingText({ item, existingItem });
 
       expect(result).toContain('Updated Name');
       expect(result).toContain('ExistingBrand');
@@ -183,7 +183,7 @@ describe('embeddingHelper', () => {
         brand: 'OldBrand',
       };
 
-      const result = getEmbeddingText(item, existingItem);
+      const result = getEmbeddingText({ item, existingItem });
 
       expect(result).toContain('New Name');
       expect(result).toContain('NewBrand');
@@ -192,7 +192,7 @@ describe('embeddingHelper', () => {
     });
 
     it('returns empty string for completely empty item', () => {
-      const result = getEmbeddingText({});
+      const result = getEmbeddingText({ item: {} });
       expect(result).toBe('');
     });
 
@@ -203,7 +203,7 @@ describe('embeddingHelper', () => {
         brand: 'Brand',
       };
 
-      const result = getEmbeddingText(item);
+      const result = getEmbeddingText({ item });
       const lines = result.split('\n');
 
       expect(lines).toHaveLength(3);
diff --git a/packages/api/src/utils/__tests__/weight.test.ts b/packages/api/src/utils/__tests__/weight.test.ts
index f979073e5d..0c980a7940 100644
--- a/packages/api/src/utils/__tests__/weight.test.ts
+++ b/packages/api/src/utils/__tests__/weight.test.ts
@@ -42,34 +42,37 @@ function makeItem(
 // ---------------------------------------------------------------------------
 describe('convertWeight', () => {
   it('returns the same value when from === to', () => {
-    expect(convertWeight(100, { from: 'g', to: 'g' })).toBe(100);
-    expect(convertWeight(5, { from: 'oz', to: 'oz' })).toBe(5);
-    expect(convertWeight(2, { from: 'kg', to: 'kg' })).toBe(2);
-    expect(convertWeight(1, { from: 'lb', to: 'lb' })).toBe(1);
+    expect(convertWeight({ weight: 100, units: { from: 'g', to: 'g' } })).toBe(100);
+    expect(convertWeight({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5);
+    expect(convertWeight({ weight: 2, units: { from: 'kg', to: 'kg' } })).toBe(2);
+    expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'lb' } })).toBe(1);
   });
 
   it('converts grams to ounces', () => {
-    expect(convertWeight(100, { from: 'g', to: 'oz' })).toBeCloseTo(3.53, 1);
+    expect(convertWeight({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo(3.53, 1);
   });
 
   it('converts ounces to grams', () => {
-    expect(convertWeight(1, { from: 'oz', to: 'g' })).toBeCloseTo(28.349523125, 8);
+    expect(convertWeight({ weight: 1, units: { from: 'oz', to: 'g' } })).toBeCloseTo(
+      28.349523125,
+      8,
+    );
   });
 
   it('converts grams to kilograms', () => {
-    expect(convertWeight(1000, { from: 'g', to: 'kg' })).toBe(1);
+    expect(convertWeight({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1);
   });
 
   it('converts kilograms to grams', () => {
-    expect(convertWeight(1, { from: 'kg', to: 'g' })).toBe(1000);
+    expect(convertWeight({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000);
   });
 
   it('converts grams to pounds', () => {
-    expect(convertWeight(453.59, { from: 'g', to: 'lb' })).toBeCloseTo(1, 1);
+    expect(convertWeight({ weight: 453.59, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 1);
   });
 
   it('converts pounds to grams', () => {
-    expect(convertWeight(1, { from: 'lb', to: 'g' })).toBeCloseTo(453.59237, 4);
+    expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'g' } })).toBeCloseTo(453.59237, 4);
   });
 });
 
@@ -78,9 +81,9 @@ describe('convertWeight', () => {
 // ---------------------------------------------------------------------------
 describe('formatWeight', () => {
   it('formats weight with unit', () => {
-    expect(formatWeight(100, 'g')).toBe('100g');
-    expect(formatWeight(3.5, 'oz')).toBe('3.5oz');
-    expect(formatWeight(0, 'kg')).toBe('0kg');
+    expect(formatWeight({ weight: 100, unit: 'g' })).toBe('100g');
+    expect(formatWeight({ weight: 3.5, unit: 'oz' })).toBe('3.5oz');
+    expect(formatWeight({ weight: 0, unit: 'kg' })).toBe('0kg');
   });
 });
 
@@ -89,28 +92,28 @@ describe('formatWeight', () => {
 // ---------------------------------------------------------------------------
 describe('convertToGrams', () => {
   it('returns the same value for grams', () => {
-    expect(convertToGrams(100, 'g')).toBe(100);
+    expect(convertToGrams({ weight: 100, unit: 'g' })).toBe(100);
   });
 
   it('converts kilograms to grams', () => {
-    expect(convertToGrams(1, 'kg')).toBe(1000);
+    expect(convertToGrams({ weight: 1, unit: 'kg' })).toBe(1000);
   });
 
   it('converts ounces to grams', () => {
-    expect(convertToGrams(1, 'oz')).toBeCloseTo(28.35, 1);
+    expect(convertToGrams({ weight: 1, unit: 'oz' })).toBeCloseTo(28.35, 1);
   });
 
   it('converts pounds to grams', () => {
-    expect(convertToGrams(1, 'lb')).toBeCloseTo(453.59, 0);
+    expect(convertToGrams({ weight: 1, unit: 'lb' })).toBeCloseTo(453.59, 0);
   });
 
   it('returns weight unchanged for unknown units', () => {
-    expect(convertToGrams(50, 'unknown')).toBe(50);
+    expect(convertToGrams({ weight: 50, unit: 'unknown' })).toBe(50);
   });
 
   it('returns weight unchanged for mixed-case units (case-sensitive)', () => {
-    expect(convertToGrams(1, 'KG')).toBe(1); // unknown → treated as grams passthrough
-    expect(convertToGrams(1, 'OZ')).toBe(1);
+    expect(convertToGrams({ weight: 1, unit: 'KG' })).toBe(1); // unknown → treated as grams passthrough
+    expect(convertToGrams({ weight: 1, unit: 'OZ' })).toBe(1);
   });
 });
 
@@ -119,12 +122,12 @@ describe('convertToGrams', () => {
 // ---------------------------------------------------------------------------
 describe('calculateBaseWeight', () => {
   it('returns 0 for an empty item list', () => {
-    expect(calculateBaseWeight([])).toBe(0);
+    expect(calculateBaseWeight({ items: [] })).toBe(0);
   });
 
   it('sums non-consumable, non-worn items', () => {
     const items = [makeItem({ weight: 200, weightUnit: 'g' })];
-    expect(calculateBaseWeight(items, 'g')).toBe(200);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(200);
   });
 
   it('excludes consumable items from base weight', () => {
@@ -132,7 +135,7 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(100);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100);
   });
 
   it('excludes worn items from base weight', () => {
@@ -140,12 +143,12 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', worn: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(100);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100);
   });
 
   it('accounts for item quantity', () => {
     const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 3 })];
-    expect(calculateBaseWeight(items, 'g')).toBe(300);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('returns 0 when all items are consumable or worn', () => {
@@ -153,7 +156,7 @@ describe('calculateBaseWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g', worn: true }),
     ];
-    expect(calculateBaseWeight(items, 'g')).toBe(0);
+    expect(calculateBaseWeight({ items, unit: 'g' })).toBe(0);
   });
 });
 
@@ -162,7 +165,7 @@ describe('calculateBaseWeight', () => {
 // ---------------------------------------------------------------------------
 describe('calculateTotalWeight', () => {
   it('returns 0 for an empty item list', () => {
-    expect(calculateTotalWeight([])).toBe(0);
+    expect(calculateTotalWeight({ items: [] })).toBe(0);
   });
 
   it('includes consumable items in total weight', () => {
@@ -170,7 +173,7 @@ describe('calculateTotalWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', consumable: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(300);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('includes worn items in total weight', () => {
@@ -178,7 +181,7 @@ describe('calculateTotalWeight', () => {
       makeItem({ weight: 200, weightUnit: 'g', worn: true }),
       makeItem({ weight: 100, weightUnit: 'g' }),
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(300);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300);
   });
 
   it('converts mixed weight units correctly', () => {
@@ -186,11 +189,11 @@ describe('calculateTotalWeight', () => {
       makeItem({ weight: 1000, weightUnit: 'g' }), // 1000 g
       makeItem({ weight: 1, weightUnit: 'kg' }), // 1000 g
     ];
-    expect(calculateTotalWeight(items, 'g')).toBe(2000);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(2000);
   });
 
   it('accounts for item quantity', () => {
     const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 5 })];
-    expect(calculateTotalWeight(items, 'g')).toBe(500);
+    expect(calculateTotalWeight({ items, unit: 'g' })).toBe(500);
   });
 });
diff --git a/packages/api/src/utils/ai/logging.ts b/packages/api/src/utils/ai/logging.ts
index 1e22af7b8e..bedebd31fb 100644
--- a/packages/api/src/utils/ai/logging.ts
+++ b/packages/api/src/utils/ai/logging.ts
@@ -11,10 +11,13 @@ export interface AIRequestLog {
   error?: string;
 }
 
-export function logAIRequest(
-  env: Env,
-  opts: { headers: Headers; log: Partial<AIRequestLog> },
-): AIRequestLog {
+export function logAIRequest({
+  env,
+  opts,
+}: {
+  env: Env;
+  opts: { headers: Headers; log: Partial<AIRequestLog> };
+}): AIRequestLog {
   const { headers, log: options } = opts;
   const log: AIRequestLog = {
     provider: env.AI_PROVIDER || 'openai',
diff --git a/packages/api/src/utils/ai/tools.ts b/packages/api/src/utils/ai/tools.ts
index 9b0e30c4c6..f10f81bbbe 100644
--- a/packages/api/src/utils/ai/tools.ts
+++ b/packages/api/src/utils/ai/tools.ts
@@ -132,9 +132,12 @@ export function createTools(userId: string) {
       }),
       execute: async ({ query, limit, offset }) => {
         try {
-          const data = await catalogService.vectorSearch(query, {
-            limit: limit || 10,
-            offset: offset || 0,
+          const data = await catalogService.vectorSearch({
+            q: query,
+            opts: {
+              limit: limit || 10,
+              offset: offset || 0,
+            },
           });
           return { success: true, data };
         } catch (error) {
@@ -161,7 +164,10 @@ export function createTools(userId: string) {
       }),
       execute: async ({ query, limit }) => {
         try {
-          const results = await aiService.searchPackratOutdoorGuidesRAG(query, limit || 5);
+          const results = await aiService.searchPackratOutdoorGuidesRAG({
+            query,
+            limit: limit || 5,
+          });
           return { success: true, data: results };
         } catch (error) {
           console.error('searchPackratOutdoorGuidesRAG', error);
diff --git a/packages/api/src/utils/auth.ts b/packages/api/src/utils/auth.ts
index 3a9aca74da..db52d5b493 100644
--- a/packages/api/src/utils/auth.ts
+++ b/packages/api/src/utils/auth.ts
@@ -5,7 +5,13 @@ export async function hashPassword(password: string): Promise<string> {
   return bcrypt.hash(password, 10);
 }
 
-export async function verifyPassword(password: string, hash: string): Promise<boolean> {
+export async function verifyPassword({
+  password,
+  hash,
+}: {
+  password: string;
+  hash: string;
+}): Promise<boolean> {
   return bcrypt.compare(password, hash);
 }
 
@@ -14,7 +20,7 @@ export async function verifyPassword(password: string, hash: string): Promise<bo
  * length-equalizing the two inputs so neither the match result nor the
  * length difference can be inferred from response timing.
  */
-export function timingSafeEqual(a: string, b: string): boolean {
+export function timingSafeEqual({ a, b }: { a: string; b: string }): boolean {
   const ab = new TextEncoder().encode(a);
   const bb = new TextEncoder().encode(b);
   const len = Math.max(ab.byteLength, bb.byteLength);
@@ -35,5 +41,5 @@ export function isValidApiKey(headers: Headers | Record<string, string | undefin
   if (!apiKeyHeader) return false;
   const { PACKRAT_API_KEY } = getEnv();
   if (!PACKRAT_API_KEY) return false;
-  return timingSafeEqual(apiKeyHeader, PACKRAT_API_KEY);
+  return timingSafeEqual({ a: apiKeyHeader, b: PACKRAT_API_KEY });
 }
diff --git a/packages/api/src/utils/chatContextHelpers.ts b/packages/api/src/utils/chatContextHelpers.ts
index f8a3772182..ff99b79588 100644
--- a/packages/api/src/utils/chatContextHelpers.ts
+++ b/packages/api/src/utils/chatContextHelpers.ts
@@ -6,7 +6,13 @@ type ChatContext = {
   contextType: 'item' | 'pack' | 'general';
 };
 
-export function generatePromptWithContext(userMessage: string, context?: ChatContext): string {
+export function generatePromptWithContext({
+  userMessage,
+  context,
+}: {
+  userMessage: string;
+  context?: ChatContext;
+}): string {
   if (!context || context.contextType === 'general') {
     return userMessage;
   }
diff --git a/packages/api/src/utils/compute-pack.ts b/packages/api/src/utils/compute-pack.ts
index 66d6de3400..c40da84579 100644
--- a/packages/api/src/utils/compute-pack.ts
+++ b/packages/api/src/utils/compute-pack.ts
@@ -2,10 +2,13 @@ import type { PackWithItems } from '@packrat/db';
 import type { WeightUnit } from '@packrat/units';
 import { displayWeight, normalize, parseWeightUnit } from '@packrat/units';
 
-export const computePackWeights = (
-  pack: PackWithItems,
-  preferredUnit: WeightUnit = 'g',
-): PackWithItems & { baseWeight: number; totalWeight: number } => {
+export const computePackWeights = ({
+  pack,
+  preferredUnit = 'g',
+}: {
+  pack: PackWithItems;
+  preferredUnit?: WeightUnit;
+}): PackWithItems & { baseWeight: number; totalWeight: number } => {
   if (!pack.items) {
     throw new Error(`Pack with ID ${pack.id} has no items`);
   }
@@ -15,7 +18,8 @@ export const computePackWeights = (
 
   for (const item of pack.items) {
     const itemWeightInGrams =
-      normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
     totalWeightGrams += itemWeightInGrams;
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
@@ -24,16 +28,19 @@ export const computePackWeights = (
 
   return {
     ...pack,
-    baseWeight: displayWeight(baseWeightGrams, preferredUnit),
-    totalWeight: displayWeight(totalWeightGrams, preferredUnit),
+    baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }),
+    totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }),
   };
 };
 
-export const computePacksWeights = (
-  packs: PackWithItems[],
-  preferredUnit: WeightUnit = 'g',
-): (PackWithItems & { baseWeight: number; totalWeight: number })[] =>
-  packs.map((pack) => computePackWeights(pack, preferredUnit));
+export const computePacksWeights = ({
+  packs,
+  preferredUnit = 'g',
+}: {
+  packs: PackWithItems[];
+  preferredUnit?: WeightUnit;
+}): (PackWithItems & { baseWeight: number; totalWeight: number })[] =>
+  packs.map((pack) => computePackWeights({ pack, preferredUnit }));
 
 export interface PackCategoryBreakdown {
   category: string;
@@ -72,7 +79,9 @@ export const computePackBreakdown = (pack: PackWithItems): PackWeightBreakdown =
   const byCategory: Record<string, PackCategoryBreakdown> = {};
 
   for (const item of pack.items) {
-    const itemGrams = normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity;
+    const itemGrams =
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+      item.quantity;
     totalGrams += itemGrams;
     if (item.worn) wornGrams += itemGrams;
     if (item.consumable) consumableGrams += itemGrams;
diff --git a/packages/api/src/utils/csv-utils.ts b/packages/api/src/utils/csv-utils.ts
index 01d17db178..43daf4deb4 100644
--- a/packages/api/src/utils/csv-utils.ts
+++ b/packages/api/src/utils/csv-utils.ts
@@ -96,7 +96,7 @@ export function mapCsvRowToItem({
   const weightStr = fieldMap.weight !== undefined ? values[fieldMap.weight] : undefined;
   const unitStr = fieldMap.weightUnit !== undefined ? values[fieldMap.weightUnit] : undefined;
   if (weightStr && parseFloat(weightStr) > 0) {
-    const { weight, unit } = parseWeight(weightStr, unitStr);
+    const { weight, unit } = parseWeight({ weightStr, unitStr });
     item.weight = weight || undefined;
     const parsedUnit = WeightUnitSchema.safeParse(unit);
     item.weightUnit = parsedUnit.success ? parsedUnit.data : undefined;
@@ -161,7 +161,7 @@ export function mapCsvRowToItem({
       if (!item.weight && !Array.isArray(parsed)) {
         const claimedWeight = parsed['Claimed Weight'] || parsed.weight;
         if (claimedWeight) {
-          const { weight, unit } = parseWeight(claimedWeight);
+          const { weight, unit } = parseWeight({ weightStr: claimedWeight });
           item.weight = weight || undefined;
           const parsedUnit = WeightUnitSchema.safeParse(unit);
           item.weightUnit = parsedUnit.success ? parsedUnit.data : undefined;
@@ -207,10 +207,10 @@ export function mapCsvRowToItem({
   return item;
 }
 
-export function parseWeight(
-  weightStr: string,
-  unitStr?: string,
-): { weight: number | null; unit: string | null } {
+export function parseWeight({ weightStr, unitStr }: { weightStr: string; unitStr?: string }): {
+  weight: number | null;
+  unit: string | null;
+} {
   if (!weightStr) return { weight: null, unit: null };
 
   const weightVal = parseFloat(weightStr);
diff --git a/packages/api/src/utils/embeddingHelper.ts b/packages/api/src/utils/embeddingHelper.ts
index 55c68e2c4a..be6aa9e37d 100644
--- a/packages/api/src/utils/embeddingHelper.ts
+++ b/packages/api/src/utils/embeddingHelper.ts
@@ -2,10 +2,13 @@ import type { CatalogItem, PackItem } from '@packrat/db';
 
 type ItemForEmbedding = Partial<CatalogItem> | Partial<PackItem>;
 
-export const getEmbeddingText = (
-  item: ItemForEmbedding,
-  existingItem?: Partial<CatalogItem> | Partial<PackItem>,
-): string => {
+export const getEmbeddingText = ({
+  item,
+  existingItem,
+}: {
+  item: ItemForEmbedding;
+  existingItem?: Partial<CatalogItem> | Partial<PackItem>;
+}): string => {
   const embeddingInput = [
     item.name,
     item.description,
diff --git a/packages/api/src/utils/weight.ts b/packages/api/src/utils/weight.ts
index 1654bd70bc..2d1f7a0159 100644
--- a/packages/api/src/utils/weight.ts
+++ b/packages/api/src/utils/weight.ts
@@ -3,27 +3,44 @@ import type { WeightUnit } from '@packrat/units';
 import { convert, displayWeight, fromGrams, normalize, parseWeightUnit } from '@packrat/units';
 
 export { fromGrams as convertFromGrams, convert as convertWeight };
-export const convertToGrams = (weight: number, unit: string): number =>
-  normalize(weight, parseWeightUnit(unit));
+export const convertToGrams = ({ weight, unit }: { weight: number; unit: string }): number =>
+  normalize({ weight, unit: parseWeightUnit({ value: unit }) });
 
-export const formatWeight = (weight: number, unit: WeightUnit): string => `${weight}${unit}`;
+export const formatWeight = ({ weight, unit }: { weight: number; unit: WeightUnit }): string =>
+  `${weight}${unit}`;
 
-export const calculateBaseWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => {
+export const calculateBaseWeight = ({
+  items,
+  unit = 'g',
+}: {
+  items: PackItem[];
+  unit?: WeightUnit;
+}): number => {
   const grams = items
     .filter((item) => !item.consumable && !item.worn)
     .reduce(
       (total, item) =>
-        total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity,
+        total +
+        normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+          item.quantity,
       0,
     );
-  return displayWeight(grams, unit);
+  return displayWeight({ grams, unit });
 };
 
-export const calculateTotalWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => {
+export const calculateTotalWeight = ({
+  items,
+  unit = 'g',
+}: {
+  items: PackItem[];
+  unit?: WeightUnit;
+}): number => {
   const grams = items.reduce(
     (total, item) =>
-      total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity,
+      total +
+      normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) *
+        item.quantity,
     0,
   );
-  return displayWeight(grams, unit);
+  return displayWeight({ grams, unit });
 };
diff --git a/packages/api/test/setup.ts b/packages/api/test/setup.ts
index 658dc9197c..9e0c270af7 100644
--- a/packages/api/test/setup.ts
+++ b/packages/api/test/setup.ts
@@ -342,10 +342,13 @@ vi.mock('@packrat/api/services/catalogService', async (importOriginal) => {
   return {
     ...actual,
     CatalogService: class extends actual.CatalogService {
-      async batchVectorSearch(
-        queries: string[],
-        _limit?: number,
-      ): Promise<BatchVectorSearchResult> {
+      async batchVectorSearch({
+        queries,
+        limit: _limit,
+      }: {
+        queries: string[];
+        limit?: number;
+      }): Promise<BatchVectorSearchResult> {
         return {
           items: queries.map(() => [
             {
diff --git a/packages/app/src/browser.ts b/packages/app/src/browser.ts
index b5f1d7b8de..c2abb4aa58 100644
--- a/packages/app/src/browser.ts
+++ b/packages/app/src/browser.ts
@@ -5,7 +5,7 @@ export const safeLocalStorage = {
     if (!isBrowser()) return null;
     return localStorage.getItem(key);
   },
-  setItem(key: string, value: string): void {
+  setItem({ key, value }: { key: string; value: string }): void {
     if (!isBrowser()) return;
     localStorage.setItem(key, value);
   },
@@ -20,7 +20,7 @@ export const safeSessionStorage = {
     if (!isBrowser()) return null;
     return sessionStorage.getItem(key);
   },
-  setItem(key: string, value: string): void {
+  setItem({ key, value }: { key: string; value: string }): void {
     if (!isBrowser()) return;
     sessionStorage.setItem(key, value);
   },
diff --git a/packages/app/src/shared/api/query-keys.ts b/packages/app/src/shared/api/query-keys.ts
index e4994ac5b7..f21699e0cb 100644
--- a/packages/app/src/shared/api/query-keys.ts
+++ b/packages/app/src/shared/api/query-keys.ts
@@ -1,6 +1,7 @@
 export const queryKeys = {
   user: ['user'] as const,
-  packs: (page = 1, limit = 20) => ['packs', { page, limit }] as const,
+  packs: ({ page = 1, limit = 20 }: { page?: number; limit?: number } = {}) =>
+    ['packs', { page, limit }] as const,
   pack: (id: string) => ['pack', id] as const,
   trips: ['trips'] as const,
   trip: (id: string) => ['trip', id] as const,
@@ -15,7 +16,12 @@ export const queryKeys = {
     } = {},
   ) => ['catalogInfinite', opts] as const,
   catalogItem: (id: number) => ['catalogItem', id] as const,
-  feed: (page = 1, filter?: 'trending' | 'recent' | 'following') =>
-    ['feed', { page, filter }] as const,
+  feed: ({
+    page = 1,
+    filter,
+  }: {
+    page?: number;
+    filter?: 'trending' | 'recent' | 'following';
+  } = {}) => ['feed', { page, filter }] as const,
   post: (id: number) => ['post', id] as const,
 };
diff --git a/packages/app/src/shared/lib/weight.ts b/packages/app/src/shared/lib/weight.ts
index 25defbdda2..bac63998c4 100644
--- a/packages/app/src/shared/lib/weight.ts
+++ b/packages/app/src/shared/lib/weight.ts
@@ -4,7 +4,7 @@ export type WeightUnit = 'g' | 'oz' | 'kg' | 'lb';
 
 export const weightUnitAtom = atom<WeightUnit>('oz');
 
-export function toGrams(weight: number, unit: WeightUnit): number {
+export function toGrams({ weight, unit }: { weight: number; unit: WeightUnit }): number {
   switch (unit) {
     case 'oz':
       return Math.round(weight * 28.3495);
@@ -17,7 +17,7 @@ export function toGrams(weight: number, unit: WeightUnit): number {
   }
 }
 
-export function fromGrams(grams: number, unit: WeightUnit): number {
+export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number {
   switch (unit) {
     case 'oz':
       return Math.round((grams / 28.3495) * 10) / 10;
@@ -30,8 +30,8 @@ export function fromGrams(grams: number, unit: WeightUnit): number {
   }
 }
 
-export function formatWeight(grams: number, unit: WeightUnit): string {
-  const value = fromGrams(grams, unit);
+export function formatWeight({ grams, unit }: { grams: number; unit: WeightUnit }): string {
+  const value = fromGrams({ grams, unit });
   return `${value}${unit}`;
 }
 
diff --git a/packages/checks/src/check-magic-strings.ts b/packages/checks/src/check-magic-strings.ts
index d895a2de4e..0848188323 100644
--- a/packages/checks/src/check-magic-strings.ts
+++ b/packages/checks/src/check-magic-strings.ts
@@ -140,7 +140,7 @@ const literalFiles = new Map<string, Set<string>>();
 
 const allFiles: string[] = [];
 
-function collectFiles(dir: string, relDir: string): void {
+function collectFiles({ dir, relDir }: { dir: string; relDir: string }): void {
   let entries: string[];
   try {
     entries = readdirSync(dir);
@@ -158,7 +158,7 @@ function collectFiles(dir: string, relDir: string): void {
       continue;
     }
     if (isDir) {
-      collectFiles(full, rel);
+      collectFiles({ dir: full, relDir: rel });
     } else if (isTargetFile(rel)) {
       allFiles.push(rel);
     }
@@ -194,7 +194,7 @@ function scanFile(relPath: string): void {
 }
 
 for (const root of SCAN_ROOTS) {
-  collectFiles(join(ROOT, root), root);
+  collectFiles({ dir: join(ROOT, root), relDir: root });
 }
 
 for (const f of allFiles) {
diff --git a/packages/checks/src/check-type-casts.ts b/packages/checks/src/check-type-casts.ts
index 2c6ea2adaa..2a08f90cad 100644
--- a/packages/checks/src/check-type-casts.ts
+++ b/packages/checks/src/check-type-casts.ts
@@ -71,7 +71,7 @@ interface Violation {
   source: string;
 }
 
-function isSafeCast(_line: string, castMatch: string): boolean {
+function isSafeCast({ castMatch }: { _line?: string; castMatch: string }): boolean {
   const full = `as ${castMatch}`;
   return SAFE_CAST_PATTERNS.some((p) => p.test(full));
 }
@@ -126,7 +126,7 @@ function collectViolations(filePath: string): Violation[] {
     CAST_PATTERN.lastIndex = 0;
     for (let match = CAST_PATTERN.exec(line); match !== null; match = CAST_PATTERN.exec(line)) {
       const castType = match[1]?.trim();
-      if (!castType || isSafeCast(line, castType)) continue;
+      if (!castType || isSafeCast({ castMatch: castType })) continue;
 
       // Skip single-word lowercase types (string, number, boolean, void, etc.)
       if (LOWERCASE_TYPE.test(castType)) continue;
diff --git a/packages/cli/src/api/run.ts b/packages/cli/src/api/run.ts
index 06eae5f9e9..51ba8f4520 100644
--- a/packages/cli/src/api/run.ts
+++ b/packages/cli/src/api/run.ts
@@ -38,9 +38,9 @@ export type RunOptions = {
  * `process.exit(1)`. Never returns null.
  */
 export async function runApi<R extends TreatyLike>(
-  promise: Promise<R>,
-  opts: RunOptions,
+  args: { promise: Promise<R> } & RunOptions,
 ): Promise<NonNullable<R['data']>> {
+  const { promise, ...opts } = args;
   let result: R;
   try {
     result = await promise;
diff --git a/packages/cli/src/args.ts b/packages/cli/src/args.ts
index 5b1d6aa31d..e33c441fb8 100644
--- a/packages/cli/src/args.ts
+++ b/packages/cli/src/args.ts
@@ -37,7 +37,13 @@ const optionalNumber = z.preprocess(
   z.coerce.number().finite().optional(),
 );
 
-export function parsePositiveIntArg(value: unknown, argName: string): number {
+export function parsePositiveIntArg({
+  value,
+  argName,
+}: {
+  value: unknown;
+  argName: string;
+}): number {
   return parseWithMessage({
     schema: positiveInteger,
     value,
@@ -46,7 +52,13 @@ export function parsePositiveIntArg(value: unknown, argName: string): number {
   });
 }
 
-export function parseNonNegativeNumberArg(value: unknown, argName: string): number {
+export function parseNonNegativeNumberArg({
+  value,
+  argName,
+}: {
+  value: unknown;
+  argName: string;
+}): number {
   return parseWithMessage({
     schema: nonNegativeNumber,
     value,
@@ -55,7 +67,13 @@ export function parseNonNegativeNumberArg(value: unknown, argName: string): numb
   });
 }
 
-export function parseOptionalNumberArg(value: unknown, argName: string): number | undefined {
+export function parseOptionalNumberArg({
+  value,
+  argName,
+}: {
+  value: unknown;
+  argName: string;
+}): number | undefined {
   return parseWithMessage({
     schema: optionalNumber,
     value,
@@ -64,7 +82,13 @@ export function parseOptionalNumberArg(value: unknown, argName: string): number
   });
 }
 
-export function parsePercentageArg(value: unknown, argName: string): number {
+export function parsePercentageArg({
+  value,
+  argName,
+}: {
+  value: unknown;
+  argName: string;
+}): number {
   return parseWithMessage({
     schema: percentage,
     value,
@@ -73,7 +97,13 @@ export function parsePercentageArg(value: unknown, argName: string): number {
   });
 }
 
-export function parseConfidenceArg(value: unknown, argName: string): number {
+export function parseConfidenceArg({
+  value,
+  argName,
+}: {
+  value: unknown;
+  argName: string;
+}): number {
   return parseWithMessage({
     schema: confidence,
     value,
diff --git a/packages/cli/src/commands/admin/analytics.ts b/packages/cli/src/commands/admin/analytics.ts
index 3960a0ac69..a1644ffbbb 100644
--- a/packages/cli/src/commands/admin/analytics.ts
+++ b/packages/cli/src/commands/admin/analytics.ts
@@ -15,15 +15,16 @@ const growthCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.platform.growth.get({
+    const data = await runApi({
+      promise: client.admin.analytics.platform.growth.get({
         query: {
           period: args.period as 'day' | 'week' | 'month' | undefined,
           range: args.range ? Number.parseInt(args.range, 10) : undefined,
         },
       }),
-      { action: 'admin growth analytics', requiresAdmin: true },
-    );
+      action: 'admin growth analytics',
+      requiresAdmin: true,
+    });
     dump(data);
   },
 });
@@ -37,15 +38,16 @@ const activityCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.platform.activity.get({
+    const data = await runApi({
+      promise: client.admin.analytics.platform.activity.get({
         query: {
           period: args.period as 'day' | 'week' | 'month' | undefined,
           range: args.range ? Number.parseInt(args.range, 10) : undefined,
         },
       }),
-      { action: 'admin activity analytics', requiresAdmin: true },
-    );
+      action: 'admin activity analytics',
+      requiresAdmin: true,
+    });
     dump(data);
   },
 });
@@ -55,7 +57,8 @@ const activeUsersCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.platform['active-users'].get(), {
+    const data = await runApi({
+      promise: client.admin.analytics.platform['active-users'].get(),
       action: 'admin active users',
       requiresAdmin: true,
     });
@@ -68,7 +71,8 @@ const breakdownCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.platform.breakdown.get(), {
+    const data = await runApi({
+      promise: client.admin.analytics.platform.breakdown.get(),
       action: 'admin breakdown',
       requiresAdmin: true,
     });
@@ -81,7 +85,8 @@ const catalogOverviewCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.catalog.overview.get(), {
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.overview.get(),
       action: 'admin catalog overview',
       requiresAdmin: true,
     });
@@ -95,12 +100,13 @@ const brandsCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.catalog.brands.get({
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.brands.get({
         query: { limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'admin top brands', requiresAdmin: true },
-    );
+      action: 'admin top brands',
+      requiresAdmin: true,
+    });
     dump(data);
   },
 });
@@ -110,7 +116,8 @@ const pricesCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.catalog.prices.get(), {
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.prices.get(),
       action: 'admin price distribution',
       requiresAdmin: true,
     });
@@ -123,7 +130,8 @@ const embeddingsCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.catalog.embeddings.get(), {
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.embeddings.get(),
       action: 'admin embedding stats',
       requiresAdmin: true,
     });
diff --git a/packages/cli/src/commands/admin/catalog.ts b/packages/cli/src/commands/admin/catalog.ts
index 5e45be1ccf..cbecb68e14 100644
--- a/packages/cli/src/commands/admin/catalog.ts
+++ b/packages/cli/src/commands/admin/catalog.ts
@@ -16,31 +16,32 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin['catalog-list'].get({
+    const data = await runApi({
+      promise: client.admin['catalog-list'].get({
         query: {
           q: args.q,
           limit: Number.parseInt(args.limit, 10),
           offset: Number.parseInt(args.offset, 10),
         },
       }),
-      { action: 'admin list catalog', requiresAdmin: true },
-    );
+      action: 'admin list catalog',
+      requiresAdmin: true,
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
     // Endpoint returns { data: [...], total, limit, offset }
-    printTable(
-      toRecordArray(toRecord(data).data).map((it) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).data).map((it) => ({
         id: it.id,
         name: isString(it.name) ? it.name.slice(0, 60) : it.name,
         brand: it.brand,
         weight: it.weight,
         price: it.price,
       })),
-      { title: 'Catalog (admin)' },
-    );
+      options: { title: 'Catalog (admin)' },
+    });
   },
 });
 
@@ -65,7 +66,8 @@ const updateCmd = defineCommand({
     if (args.weight) body.weight = Number.parseFloat(args.weight);
     if (args['weight-unit']) body.weightUnit = args['weight-unit'];
     if (args.price) body.price = Number.parseFloat(args.price);
-    await runApi(client.admin.catalog({ id: args.id }).patch(body), {
+    await runApi({
+      promise: client.admin.catalog({ id: args.id }).patch(body),
       action: 'admin update catalog item',
       resourceHint: `item ${args.id}`,
       requiresAdmin: true,
@@ -87,7 +89,8 @@ const deleteCmd = defineCommand({
       if (!confirm) return consola.info('Aborted.');
     }
     const client = await getAdminClient();
-    await runApi(client.admin.catalog({ id: args.id }).delete(), {
+    await runApi({
+      promise: client.admin.catalog({ id: args.id }).delete(),
       action: 'admin delete catalog item',
       resourceHint: `item ${args.id}`,
       requiresAdmin: true,
diff --git a/packages/cli/src/commands/admin/etl.ts b/packages/cli/src/commands/admin/etl.ts
index a6adedd470..3fa6bb5676 100644
--- a/packages/cli/src/commands/admin/etl.ts
+++ b/packages/cli/src/commands/admin/etl.ts
@@ -9,12 +9,13 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.catalog.etl.get({
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.etl.get({
         query: { limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'admin list ETL jobs', requiresAdmin: true },
-    );
+      action: 'admin list ETL jobs',
+      requiresAdmin: true,
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -25,12 +26,13 @@ const failureSummaryCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.catalog.etl['failure-summary'].get({
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.etl['failure-summary'].get({
         query: { limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'admin ETL failure summary', requiresAdmin: true },
-    );
+      action: 'admin ETL failure summary',
+      requiresAdmin: true,
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -44,12 +46,14 @@ const jobFailuresCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.catalog.etl({ jobId: args.id }).failures.get({
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.etl({ jobId: args.id }).failures.get({
         query: { limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'admin ETL job failures', resourceHint: `job ${args.id}`, requiresAdmin: true },
-    );
+      action: 'admin ETL job failures',
+      resourceHint: `job ${args.id}`,
+      requiresAdmin: true,
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -59,7 +63,8 @@ const resetStuckCmd = defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.analytics.catalog.etl['reset-stuck'].post({}), {
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.etl['reset-stuck'].post({}),
       action: 'admin reset stuck ETL',
       requiresAdmin: true,
     });
@@ -73,10 +78,12 @@ const retryCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.analytics.catalog.etl({ jobId: args.id }).retry.post({}),
-      { action: 'admin retry ETL job', resourceHint: `job ${args.id}`, requiresAdmin: true },
-    );
+    const data = await runApi({
+      promise: client.admin.analytics.catalog.etl({ jobId: args.id }).retry.post({}),
+      action: 'admin retry ETL job',
+      resourceHint: `job ${args.id}`,
+      requiresAdmin: true,
+    });
     consola.success(`Retried: ${JSON.stringify(data)}`);
   },
 });
diff --git a/packages/cli/src/commands/admin/login.ts b/packages/cli/src/commands/admin/login.ts
index b26c1af057..a86b38e2ef 100644
--- a/packages/cli/src/commands/admin/login.ts
+++ b/packages/cli/src/commands/admin/login.ts
@@ -21,7 +21,8 @@ export default defineCommand({
     // The user-scope Treaty client is fine here — /admin/login is the
     // credential-exchange route and ignores any Bearer header.
     const client = await getUserClient();
-    const { token, expiresIn } = await runApi(client.admin.login.post({ username, password }), {
+    const { token, expiresIn } = await runApi({
+      promise: client.admin.login.post({ username, password }),
       action: 'admin login',
     });
 
diff --git a/packages/cli/src/commands/admin/packs.ts b/packages/cli/src/commands/admin/packs.ts
index fe65d55ea0..b39c865e85 100644
--- a/packages/cli/src/commands/admin/packs.ts
+++ b/packages/cli/src/commands/admin/packs.ts
@@ -17,8 +17,8 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin['packs-list'].get({
+    const data = await runApi({
+      promise: client.admin['packs-list'].get({
         query: {
           q: args.q,
           limit: Number.parseInt(args.limit, 10),
@@ -26,22 +26,23 @@ const listCmd = defineCommand({
           includeDeleted: args['include-deleted'],
         },
       }),
-      { action: 'admin list packs', requiresAdmin: true },
-    );
+      action: 'admin list packs',
+      requiresAdmin: true,
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
     // Endpoint returns { data: [...], total, limit, offset }
-    printTable(
-      toRecordArray(toRecord(data).data).map((p) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).data).map((p) => ({
         id: p.id,
         name: p.name,
         userId: p.userId,
         deleted: p.deleted,
       })),
-      { title: 'Packs (admin)' },
-    );
+      options: { title: 'Packs (admin)' },
+    });
   },
 });
 
@@ -58,7 +59,8 @@ const deleteCmd = defineCommand({
       if (!confirm) return consola.info('Aborted.');
     }
     const client = await getAdminClient();
-    await runApi(client.admin.packs({ id: args.id }).delete(), {
+    await runApi({
+      promise: client.admin.packs({ id: args.id }).delete(),
       action: 'admin delete pack',
       resourceHint: `pack ${args.id}`,
       requiresAdmin: true,
diff --git a/packages/cli/src/commands/admin/stats.ts b/packages/cli/src/commands/admin/stats.ts
index 46b9ce5663..da2137c08e 100644
--- a/packages/cli/src/commands/admin/stats.ts
+++ b/packages/cli/src/commands/admin/stats.ts
@@ -9,10 +9,11 @@ export default defineCommand({
   async run() {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(client.admin.stats.get(), {
+    const data = await runApi({
+      promise: client.admin.stats.get(),
       action: 'admin stats',
       requiresAdmin: true,
     });
-    printSummary(toRecord(data), 'Admin stats');
+    printSummary({ data: toRecord(data), title: 'Admin stats' });
   },
 });
diff --git a/packages/cli/src/commands/admin/trails.ts b/packages/cli/src/commands/admin/trails.ts
index a4c5ef02e8..58228a2897 100644
--- a/packages/cli/src/commands/admin/trails.ts
+++ b/packages/cli/src/commands/admin/trails.ts
@@ -16,8 +16,8 @@ const searchCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.trails.search.get({
+    const data = await runApi({
+      promise: client.admin.trails.search.get({
         query: {
           q: args.q,
           sport: args.sport,
@@ -25,16 +25,17 @@ const searchCmd = defineCommand({
           offset: Number.parseInt(args.offset, 10),
         },
       }),
-      { action: 'admin search trails', requiresAdmin: true },
-    );
-    printTable(
-      toRecordArray(toRecord(data).trails).map((t) => ({
+      action: 'admin search trails',
+      requiresAdmin: true,
+    });
+    printTable({
+      rows: toRecordArray(toRecord(data).trails).map((t) => ({
         osmId: t.osmId,
         name: t.name,
         sport: t.sport,
       })),
-      { title: 'Trails (admin)' },
-    );
+      options: { title: 'Trails (admin)' },
+    });
   },
 });
 
@@ -50,8 +51,8 @@ const reportsCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin.trails.conditions.get({
+    const data = await runApi({
+      promise: client.admin.trails.conditions.get({
         query: {
           q: args.q,
           limit: Number.parseInt(args.limit, 10),
@@ -59,23 +60,24 @@ const reportsCmd = defineCommand({
           includeDeleted: args['include-deleted'],
         },
       }),
-      { action: 'admin list trail reports', requiresAdmin: true },
-    );
+      action: 'admin list trail reports',
+      requiresAdmin: true,
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
     // Endpoint returns { data: [...], total, limit, offset }
-    printTable(
-      toRecordArray(toRecord(data).data).map((r) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).data).map((r) => ({
         id: r.id,
         trailName: r.trailName,
         condition: r.overallCondition,
         userId: r.userId,
         deleted: r.deleted,
       })),
-      { title: 'Trail reports (admin)' },
-    );
+      options: { title: 'Trail reports (admin)' },
+    });
   },
 });
 
@@ -85,7 +87,8 @@ const deleteReportCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    await runApi(client.admin.trails.conditions({ reportId: args.id }).delete(), {
+    await runApi({
+      promise: client.admin.trails.conditions({ reportId: args.id }).delete(),
       action: 'admin delete trail report',
       resourceHint: `report ${args.id}`,
       requiresAdmin: true,
diff --git a/packages/cli/src/commands/admin/users.ts b/packages/cli/src/commands/admin/users.ts
index 0f443c6e99..501d056b3e 100644
--- a/packages/cli/src/commands/admin/users.ts
+++ b/packages/cli/src/commands/admin/users.ts
@@ -16,31 +16,32 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAdmin();
     const client = await getAdminClient();
-    const data = await runApi(
-      client.admin['users-list'].get({
+    const data = await runApi({
+      promise: client.admin['users-list'].get({
         query: {
           q: args.q,
           limit: Number.parseInt(args.limit, 10),
           offset: Number.parseInt(args.offset, 10),
         },
       }),
-      { action: 'admin list users', requiresAdmin: true },
-    );
+      action: 'admin list users',
+      requiresAdmin: true,
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
     // Endpoint returns { data: [...], total, limit, offset }
     const items = toRecordArray(toRecord(data).data);
-    printTable(
-      items.map((u) => ({
+    printTable({
+      rows: items.map((u) => ({
         id: u.id,
         email: u.email,
         name: u.name ?? u.firstName,
         createdAt: u.createdAt,
       })),
-      { title: 'Users' },
-    );
+      options: { title: 'Users' },
+    });
   },
 });
 
@@ -63,7 +64,8 @@ const hardDeleteCmd = defineCommand({
       }
     }
     const client = await getAdminClient();
-    await runApi(client.admin.users({ id: args.id }).hard.delete({ reason: args.reason }), {
+    await runApi({
+      promise: client.admin.users({ id: args.id }).hard.delete({ reason: args.reason }),
       action: 'hard delete user',
       resourceHint: `user ${args.id}`,
       requiresAdmin: true,
diff --git a/packages/cli/src/commands/ai/index.ts b/packages/cli/src/commands/ai/index.ts
index dc9d9cd9ac..cdc224d884 100644
--- a/packages/cli/src/commands/ai/index.ts
+++ b/packages/cli/src/commands/ai/index.ts
@@ -11,12 +11,12 @@ const ragCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client.ai['rag-search'].get({
+    const data = await runApi({
+      promise: client.ai['rag-search'].get({
         query: { q: args.q, limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'rag search' },
-    );
+      action: 'rag search',
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -27,7 +27,8 @@ const webCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.ai['web-search'].get({ query: { q: args.q } }), {
+    const data = await runApi({
+      promise: client.ai['web-search'].get({ query: { q: args.q } }),
       action: 'web search',
     });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
@@ -43,13 +44,13 @@ const sqlCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client.ai['execute-sql'].post({
+    const data = await runApi({
+      promise: client.ai['execute-sql'].post({
         query: args.query,
         limit: Number.parseInt(args.limit, 10),
       }),
-      { action: 'execute sql' },
-    );
+      action: 'execute sql',
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -59,7 +60,7 @@ const schemaCmd = defineCommand({
   async run() {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.ai['db-schema'].get(), { action: 'fetch db schema' });
+    const data = await runApi({ promise: client.ai['db-schema'].get(), action: 'fetch db schema' });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
diff --git a/packages/cli/src/commands/auth/whoami.ts b/packages/cli/src/commands/auth/whoami.ts
index 679228b344..73937b7995 100644
--- a/packages/cli/src/commands/auth/whoami.ts
+++ b/packages/cli/src/commands/auth/whoami.ts
@@ -11,11 +11,13 @@ export default defineCommand({
   async run() {
     await requireAuth();
     const client = await getUserClient();
-    const response = toRecord(await runApi(client.user.profile.get(), { action: 'fetch profile' }));
+    const response = toRecord(
+      await runApi({ promise: client.user.profile.get(), action: 'fetch profile' }),
+    );
     const user = toRecord(response.user);
     const config = await loadConfig();
-    printSummary(
-      {
+    printSummary({
+      data: {
         baseUrl: config.baseUrl,
         userId: config.userId ?? '—',
         email: config.userEmail ?? user.email ?? '—',
@@ -24,8 +26,8 @@ export default defineCommand({
         adminTokenSet: Boolean(config.adminToken),
         configFile: CONFIG_FILE_PATH,
       },
-      'PackRat session',
-    );
+      title: 'PackRat session',
+    });
     consola.success('Session looks healthy.');
   },
 });
diff --git a/packages/cli/src/commands/brand.ts b/packages/cli/src/commands/brand.ts
index f94d510dc9..60806c50ef 100644
--- a/packages/cli/src/commands/brand.ts
+++ b/packages/cli/src/commands/brand.ts
@@ -10,9 +10,12 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const rows = await cache.analyzeBrand(args.name, parseCsvArg(args.sites));
-    printTable(rows, {
-      title: `Brand Analysis: "${args.name}"`,
+    const rows = await cache.analyzeBrand({ brandName: args.name, sites: parseCsvArg(args.sites) });
+    printTable({
+      rows,
+      options: {
+        title: `Brand Analysis: "${args.name}"`,
+      },
     });
   },
 });
diff --git a/packages/cli/src/commands/brands.ts b/packages/cli/src/commands/brands.ts
index e78e11b4c9..7eb05d63dc 100644
--- a/packages/cli/src/commands/brands.ts
+++ b/packages/cli/src/commands/brands.ts
@@ -10,7 +10,10 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const rows = await cache.getTopBrands(parsePositiveIntArg(args.limit, '--limit'), args.site);
-    printTable(rows, { title: 'Top Brands' });
+    const rows = await cache.getTopBrands({
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
+      site: args.site,
+    });
+    printTable({ rows, options: { title: 'Top Brands' } });
   },
 });
diff --git a/packages/cli/src/commands/build-specs.ts b/packages/cli/src/commands/build-specs.ts
index 375cbc5149..da6fb0a6ec 100644
--- a/packages/cli/src/commands/build-specs.ts
+++ b/packages/cli/src/commands/build-specs.ts
@@ -10,7 +10,7 @@ export default defineCommand({
     const conn = cache.getConnection();
 
     consola.start('Building spec table...');
-    const parser = new SpecParser(conn);
+    const parser = new SpecParser({ conn });
     const stats = await parser.build();
     consola.success(
       `Parsed ${stats.parsed.toLocaleString()} / ${stats.total.toLocaleString()} products`,
diff --git a/packages/cli/src/commands/cache.ts b/packages/cli/src/commands/cache.ts
index e7f834d5b0..1be2a9dcd6 100644
--- a/packages/cli/src/commands/cache.ts
+++ b/packages/cli/src/commands/cache.ts
@@ -59,29 +59,29 @@ async function showStatus(): Promise<void> {
     }
     consola.start('Fetching catalog stats...');
     const stats = await cache.getLiveStats();
-    printSummary(
-      {
+    printSummary({
+      data: {
         Mode: 'catalog (R2 Data Catalog / Iceberg)',
         Records: stats.recordCount.toLocaleString(),
         Sites: stats.sites.join(', ') || '(none)',
       },
-      'Cache Status',
-    );
+      title: 'Cache Status',
+    });
   } else {
     const cache = await getCache();
     const stats = cache.getCacheStats();
     if (stats.recordCount === 0) {
       consola.info('Cache is empty. Run with --refresh to populate.');
     } else {
-      printSummary(
-        {
+      printSummary({
+        data: {
           Mode: 'local (DuckDB file)',
           Records: stats.recordCount.toLocaleString(),
           Sites: stats.sites.join(', '),
           'Last Updated': stats.updatedAt ?? 'Never',
         },
-        'Cache Status',
-      );
+        title: 'Cache Status',
+      });
     }
   }
 }
diff --git a/packages/cli/src/commands/catalog/index.ts b/packages/cli/src/commands/catalog/index.ts
index 5ed577d344..15e3f07613 100644
--- a/packages/cli/src/commands/catalog/index.ts
+++ b/packages/cli/src/commands/catalog/index.ts
@@ -18,18 +18,18 @@ const searchCmd = defineCommand({
     const client = await getUserClient();
     const limit = Number.parseInt(args.limit, 10);
     const page = Number.parseInt(args.page, 10);
-    const data = await runApi(
-      client.catalog.get({
+    const data = await runApi({
+      promise: client.catalog.get({
         query: { q: args.q, category: args.category, limit, page },
       }),
-      { action: 'search catalog' },
-    );
+      action: 'search catalog',
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(toRecord(data).items).map((it) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).items).map((it) => ({
         id: it.id,
         name: isString(it.name) ? it.name.slice(0, 60) : it.name,
         brand: it.brand,
@@ -37,8 +37,8 @@ const searchCmd = defineCommand({
         price: it.price,
         rating: it.ratingValue,
       })),
-      { title: `Catalog "${args.q}"` },
-    );
+      options: { title: `Catalog "${args.q}"` },
+    });
   },
 });
 
@@ -53,23 +53,23 @@ const semanticCmd = defineCommand({
     await requireAuth();
     const client = await getUserClient();
     const limit = Number.parseInt(args.limit, 10);
-    const data = await runApi(
-      client.catalog['vector-search'].get({ query: { q: args.q, limit, offset: 0 } }),
-      { action: 'semantic catalog search' },
-    );
+    const data = await runApi({
+      promise: client.catalog['vector-search'].get({ query: { q: args.q, limit, offset: 0 } }),
+      action: 'semantic catalog search',
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(toRecord(data).items).map((it) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).items).map((it) => ({
         id: it.id,
         name: isString(it.name) ? it.name.slice(0, 60) : it.name,
         brand: it.brand,
         similarity: it.similarity,
       })),
-      { title: `Semantic: "${args.q}"` },
-    );
+      options: { title: `Semantic: "${args.q}"` },
+    });
   },
 });
 
@@ -82,7 +82,8 @@ const getCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const item = await runApi(client.catalog({ id: args.id }).get(), {
+    const item = await runApi({
+      promise: client.catalog({ id: args.id }).get(),
       action: 'get catalog item',
       resourceHint: `item ${args.id}`,
     });
@@ -91,8 +92,8 @@ const getCmd = defineCommand({
       return;
     }
     const r = toRecord(item);
-    printSummary(
-      {
+    printSummary({
+      data: {
         id: r.id,
         name: r.name,
         brand: r.brand,
@@ -102,8 +103,8 @@ const getCmd = defineCommand({
         reviewCount: r.reviewCount,
         productUrl: r.productUrl,
       },
-      `Item ${r.id}`,
-    );
+      title: `Item ${r.id}`,
+    });
   },
 });
 
@@ -112,7 +113,8 @@ const categoriesCmd = defineCommand({
   async run() {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.catalog.categories.get({ query: { limit: 50 } }), {
+    const data = await runApi({
+      promise: client.catalog.categories.get({ query: { limit: 50 } }),
       action: 'list catalog categories',
     });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
diff --git a/packages/cli/src/commands/category.ts b/packages/cli/src/commands/category.ts
index 016a9cbad6..c4c42464b2 100644
--- a/packages/cli/src/commands/category.ts
+++ b/packages/cli/src/commands/category.ts
@@ -10,7 +10,10 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const rows = await cache.categoryInsights(args.name, parseCsvArg(args.sites));
-    printTable(rows, { title: `Category: "${args.name}"` });
+    const rows = await cache.categoryInsights({
+      categoryKeyword: args.name,
+      sites: parseCsvArg(args.sites),
+    });
+    printTable({ rows, options: { title: `Category: "${args.name}"` } });
   },
 });
diff --git a/packages/cli/src/commands/compare.ts b/packages/cli/src/commands/compare.ts
index e8f8691ede..80575c2a2b 100644
--- a/packages/cli/src/commands/compare.ts
+++ b/packages/cli/src/commands/compare.ts
@@ -10,9 +10,15 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const rows = await cache.comparePrices(args.keyword, parseCsvArg(args.sites));
-    printTable(rows, {
-      title: `Price Comparison: "${args.keyword}"`,
+    const rows = await cache.comparePrices({
+      keyword: args.keyword,
+      sites: parseCsvArg(args.sites),
+    });
+    printTable({
+      rows,
+      options: {
+        title: `Price Comparison: "${args.keyword}"`,
+      },
     });
   },
 });
diff --git a/packages/cli/src/commands/deals.ts b/packages/cli/src/commands/deals.ts
index 66003374a5..f151ded793 100644
--- a/packages/cli/src/commands/deals.ts
+++ b/packages/cli/src/commands/deals.ts
@@ -12,23 +12,29 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const maxPrice = parseNonNegativeNumberArg(args['max-price'], '--max-price');
-    const rows = await cache.findDeals(maxPrice, {
-      category: args.category,
-      sites: parseCsvArg(args.sites),
-      limit: parsePositiveIntArg(args.limit, '--limit'),
+    const maxPrice = parseNonNegativeNumberArg({
+      value: args['max-price'],
+      argName: '--max-price',
     });
-    printTable(
-      rows.map(({ site, name, brand, price, category }) => ({
+    const rows = await cache.findDeals({
+      maxPrice,
+      options: {
+        category: args.category,
+        sites: parseCsvArg(args.sites),
+        limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
+      },
+    });
+    printTable({
+      rows: rows.map(({ site, name, brand, price, category }) => ({
         site,
         name: name.slice(0, 50),
         brand,
         price,
         category,
       })),
-      {
+      options: {
         title: `Deals under $${maxPrice}`,
       },
-    );
+    });
   },
 });
diff --git a/packages/cli/src/commands/export.ts b/packages/cli/src/commands/export.ts
index daedd6d204..d4d86592a0 100644
--- a/packages/cli/src/commands/export.ts
+++ b/packages/cli/src/commands/export.ts
@@ -45,14 +45,14 @@ export default defineCommand({
     const summary = await exporter.export({
       format,
       outputDir: args['output-dir'],
-      sample: parseOptionalNumberArg(args.sample, '--sample'),
+      sample: parseOptionalNumberArg({ value: args.sample, argName: '--sample' }),
       dedup,
       includeQuality: args.quality ?? dedup !== 'none',
       skuFilter: args.sku,
     });
 
-    printSummary(
-      {
+    printSummary({
+      data: {
         File: summary.filepath,
         Records: summary.totalRecords,
         'Unique SKUs': summary.uniqueSkus,
@@ -60,7 +60,7 @@ export default defineCommand({
         Brands: summary.brands,
         Strategy: summary.strategy,
       },
-      'Export Complete',
-    );
+      title: 'Export Complete',
+    });
   },
 });
diff --git a/packages/cli/src/commands/feed/index.ts b/packages/cli/src/commands/feed/index.ts
index cdab7cd018..ff5417641d 100644
--- a/packages/cli/src/commands/feed/index.ts
+++ b/packages/cli/src/commands/feed/index.ts
@@ -11,12 +11,12 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client.feed.get({
+    const data = await runApi({
+      promise: client.feed.get({
         query: { page: Number.parseInt(args.page, 10), limit: Number.parseInt(args.limit, 10) },
       }),
-      { action: 'list feed' },
-    );
+      action: 'list feed',
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -36,7 +36,8 @@ const postCmd = defineCommand({
           .map((s) => s.trim())
           .filter(Boolean)
       : [];
-    const data = await runApi(client.feed.post({ caption: args.caption, images }), {
+    const data = await runApi({
+      promise: client.feed.post({ caption: args.caption, images }),
       action: 'create feed post',
     });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
@@ -49,7 +50,8 @@ const likeCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.feed({ postId: args.id }).like.post({}), {
+    const data = await runApi({
+      promise: client.feed({ postId: args.id }).like.post({}),
       action: 'toggle post like',
       resourceHint: `post ${args.id}`,
     });
@@ -67,13 +69,14 @@ const commentCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client.feed({ postId: args.id }).comments.post({
+    const data = await runApi({
+      promise: client.feed({ postId: args.id }).comments.post({
         content: args.content,
         parentCommentId: args.parent ? Number.parseInt(args.parent, 10) : undefined,
       }),
-      { action: 'create feed comment', resourceHint: `post ${args.id}` },
-    );
+      action: 'create feed comment',
+      resourceHint: `post ${args.id}`,
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
diff --git a/packages/cli/src/commands/filter.ts b/packages/cli/src/commands/filter.ts
index e3f6e7110b..1275fa0d6f 100644
--- a/packages/cli/src/commands/filter.ts
+++ b/packages/cli/src/commands/filter.ts
@@ -26,24 +26,24 @@ export default defineCommand({
       temp: 'temp_rating_f',
     };
 
-    const parser = new SpecParser(conn);
+    const parser = new SpecParser({ conn });
     const rows = await parser.filterProducts({
       category: args.category,
       maxWeightG: args['max-weight']
-        ? parseNonNegativeNumberArg(args['max-weight'], '--max-weight')
+        ? parseNonNegativeNumberArg({ value: args['max-weight'], argName: '--max-weight' })
         : undefined,
       maxTempF: args['max-temp']
-        ? parseOptionalNumberArg(args['max-temp'], '--max-temp')
+        ? parseOptionalNumberArg({ value: args['max-temp'], argName: '--max-temp' })
         : undefined,
-      maxPrice: parseOptionalNumberArg(args['max-price'], '--max-price'),
-      minPrice: parseOptionalNumberArg(args['min-price'], '--min-price'),
+      maxPrice: parseOptionalNumberArg({ value: args['max-price'], argName: '--max-price' }),
+      minPrice: parseOptionalNumberArg({ value: args['min-price'], argName: '--min-price' }),
       gender: args.gender,
       seasons: args.seasons,
       sortBy: sortMap[args.sort] ?? 'price',
-      limit: parsePositiveIntArg(args.limit, '--limit'),
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
     });
-    printTable(
-      rows.map(({ name, brand, price, weight_grams, temp_rating_f, seasons, gender }) => ({
+    printTable({
+      rows: rows.map(({ name, brand, price, weight_grams, temp_rating_f, seasons, gender }) => ({
         name: String(name).slice(0, 40),
         brand,
         price,
@@ -52,7 +52,7 @@ export default defineCommand({
         seasons,
         gender,
       })),
-      { title: 'Filtered Products' },
-    );
+      options: { title: 'Filtered Products' },
+    });
   },
 });
diff --git a/packages/cli/src/commands/images.ts b/packages/cli/src/commands/images.ts
index 3a2eaa2d68..298bedfa38 100644
--- a/packages/cli/src/commands/images.ts
+++ b/packages/cli/src/commands/images.ts
@@ -14,21 +14,21 @@ export default defineCommand({
   async run({ args }) {
     const cache = await ensureCache();
     const conn = cache.getConnection();
-    const limit = parsePositiveIntArg(args.limit, '--limit');
+    const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' });
 
-    const enrichment = new Enrichment(conn);
+    const enrichment = new Enrichment({ conn });
 
     if (args.build) {
       consola.start('Building image aggregation...');
       const stats = await enrichment.buildImages();
-      printSummary(
-        {
+      printSummary({
+        data: {
           'Total images': stats.total_images,
           'Products with images': stats.products_with_images,
           'Unique URLs': stats.unique_urls,
         },
-        'Image Aggregation Complete',
-      );
+        title: 'Image Aggregation Complete',
+      });
       return;
     }
 
@@ -37,19 +37,19 @@ export default defineCommand({
       return;
     }
 
-    const images = await enrichment.getProductImages(args.product, limit);
+    const images = await enrichment.getProductImages({ query: args.product, limit });
     if (images.length === 0) {
       consola.warn('No images found. Run `packrat images --build` first.');
       return;
     }
 
-    printTable(
-      images.map((img) => ({
+    printTable({
+      rows: images.map((img) => ({
         Site: img.site,
         Name: String(img.name).slice(0, 40),
         URL: String(img.url).slice(0, 60),
       })),
-      { title: `Images: "${args.product}"` },
-    );
+      options: { title: `Images: "${args.product}"` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/lightweight.ts b/packages/cli/src/commands/lightweight.ts
index 2b9af32bea..55c4ff960a 100644
--- a/packages/cli/src/commands/lightweight.ts
+++ b/packages/cli/src/commands/lightweight.ts
@@ -17,15 +17,18 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const maxWeight = parseNonNegativeNumberArg(args['max-weight'], '--max-weight');
+    const maxWeight = parseNonNegativeNumberArg({
+      value: args['max-weight'],
+      argName: '--max-weight',
+    });
     const rows = await cache.findLightweight({
       category: args.category,
       maxWeightG: maxWeight,
       sites: parseCsvArg(args.sites),
-      limit: parsePositiveIntArg(args.limit, '--limit'),
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
     });
-    printTable(
-      rows.map(({ site, name, brand, weight_g, price, weight_per_dollar }) => ({
+    printTable({
+      rows: rows.map(({ site, name, brand, weight_g, price, weight_per_dollar }) => ({
         site,
         name: String(name).slice(0, 40),
         brand,
@@ -33,7 +36,7 @@ export default defineCommand({
         price,
         'g/$': weight_per_dollar,
       })),
-      { title: `Lightweight Gear (≤${maxWeight}g)` },
-    );
+      options: { title: `Lightweight Gear (≤${maxWeight}g)` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/market-share.ts b/packages/cli/src/commands/market-share.ts
index f2d8604682..de20919575 100644
--- a/packages/cli/src/commands/market-share.ts
+++ b/packages/cli/src/commands/market-share.ts
@@ -12,8 +12,8 @@ export default defineCommand({
     const cache = await ensureCache();
     const rows = await cache.getMarketShare({
       category: args.category,
-      topN: parsePositiveIntArg(args.top, '--top'),
+      topN: parsePositiveIntArg({ value: args.top, argName: '--top' }),
     });
-    printTable(rows, { title: 'Market Share' });
+    printTable({ rows, options: { title: 'Market Share' } });
   },
 });
diff --git a/packages/cli/src/commands/packs/create.ts b/packages/cli/src/commands/packs/create.ts
index 7c80733469..e3032ae3a3 100644
--- a/packages/cli/src/commands/packs/create.ts
+++ b/packages/cli/src/commands/packs/create.ts
@@ -29,8 +29,8 @@ export default defineCommand({
           .map((t) => t.trim())
           .filter(Boolean)
       : undefined;
-    const pack = await runApi(
-      client.packs.post({
+    const pack = await runApi({
+      promise: client.packs.post({
         id: shortId('p'),
         name: args.name,
         description: args.description,
@@ -40,8 +40,8 @@ export default defineCommand({
         localCreatedAt: now,
         localUpdatedAt: now,
       }),
-      { action: 'create pack' },
-    );
+      action: 'create pack',
+    });
     consola.success(`Created pack ${toRecord(pack).id ?? '(unknown id)'}`);
   },
 });
diff --git a/packages/cli/src/commands/packs/delete.ts b/packages/cli/src/commands/packs/delete.ts
index f47f423e66..1382c07984 100644
--- a/packages/cli/src/commands/packs/delete.ts
+++ b/packages/cli/src/commands/packs/delete.ts
@@ -19,7 +19,8 @@ export default defineCommand({
       }
     }
     const client = await getUserClient();
-    await runApi(client.packs({ packId: args.id }).delete(), {
+    await runApi({
+      promise: client.packs({ packId: args.id }).delete(),
       action: 'delete pack',
       resourceHint: `pack ${args.id}`,
     });
diff --git a/packages/cli/src/commands/packs/gap-analysis.ts b/packages/cli/src/commands/packs/gap-analysis.ts
index a3a1e523b7..831ad8b943 100644
--- a/packages/cli/src/commands/packs/gap-analysis.ts
+++ b/packages/cli/src/commands/packs/gap-analysis.ts
@@ -32,16 +32,17 @@ export default defineCommand({
       process.exit(1);
     }
     const client = await getUserClient();
-    const result = await runApi(
-      client.packs({ packId: args.id })['gap-analysis'].post({
+    const result = await runApi({
+      promise: client.packs({ packId: args.id })['gap-analysis'].post({
         destination: args.destination,
         tripType: args['trip-type'],
         duration,
         startDate: args.start,
         endDate: args.end,
       }),
-      { action: 'analyze pack gaps', resourceHint: `pack ${args.id}` },
-    );
+      action: 'analyze pack gaps',
+      resourceHint: `pack ${args.id}`,
+    });
     process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
   },
 });
diff --git a/packages/cli/src/commands/packs/get.ts b/packages/cli/src/commands/packs/get.ts
index deb11f152e..eaa39372cc 100644
--- a/packages/cli/src/commands/packs/get.ts
+++ b/packages/cli/src/commands/packs/get.ts
@@ -13,7 +13,8 @@ export default defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const pack = await runApi(client.packs({ packId: args.id }).get(), {
+    const pack = await runApi({
+      promise: client.packs({ packId: args.id }).get(),
       action: 'get pack',
       resourceHint: `pack ${args.id}`,
     });
@@ -22,8 +23,8 @@ export default defineCommand({
       return;
     }
     const p = toRecord(pack);
-    printSummary(
-      {
+    printSummary({
+      data: {
         id: p.id,
         name: p.name,
         category: p.category,
@@ -35,7 +36,7 @@ export default defineCommand({
         isPublic: p.isPublic,
         items: Array.isArray(p.items) ? p.items.length : 0,
       },
-      `Pack ${p.name ?? args.id}`,
-    );
+      title: `Pack ${p.name ?? args.id}`,
+    });
   },
 });
diff --git a/packages/cli/src/commands/packs/items.ts b/packages/cli/src/commands/packs/items.ts
index 86f2aa6867..6e94b3e0c0 100644
--- a/packages/cli/src/commands/packs/items.ts
+++ b/packages/cli/src/commands/packs/items.ts
@@ -13,7 +13,8 @@ export default defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const items = await runApi(client.packs({ packId: args.id }).items.get(), {
+    const items = await runApi({
+      promise: client.packs({ packId: args.id }).items.get(),
       action: 'list pack items',
       resourceHint: `pack ${args.id}`,
     });
@@ -21,8 +22,8 @@ export default defineCommand({
       process.stdout.write(`${JSON.stringify(items, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(items).map((r) => ({
+    printTable({
+      rows: toRecordArray(items).map((r) => ({
         id: r.id,
         name: r.name,
         category: r.category,
@@ -31,7 +32,7 @@ export default defineCommand({
         worn: r.worn,
         consumable: r.consumable,
       })),
-      { title: `Items in ${args.id}` },
-    );
+      options: { title: `Items in ${args.id}` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/packs/list.ts b/packages/cli/src/commands/packs/list.ts
index db63e4a711..68921b1a67 100644
--- a/packages/cli/src/commands/packs/list.ts
+++ b/packages/cli/src/commands/packs/list.ts
@@ -18,15 +18,16 @@ export default defineCommand({
     await requireAuth();
     const client = await getUserClient();
     const includePublic = args['include-public'] ? 1 : 0;
-    const packs = await runApi(client.packs.get({ query: { includePublic } }), {
+    const packs = await runApi({
+      promise: client.packs.get({ query: { includePublic } }),
       action: 'list packs',
     });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(packs, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(packs).map((r) => ({
+    printTable({
+      rows: toRecordArray(packs).map((r) => ({
         id: r.id,
         name: r.name,
         category: r.category,
@@ -34,7 +35,7 @@ export default defineCommand({
         totalGrams: r.totalWeight,
         isPublic: r.isPublic,
       })),
-      { title: 'Your packs' },
-    );
+      options: { title: 'Your packs' },
+    });
   },
 });
diff --git a/packages/cli/src/commands/prices.ts b/packages/cli/src/commands/prices.ts
index 40b242a60c..856f66eb2b 100644
--- a/packages/cli/src/commands/prices.ts
+++ b/packages/cli/src/commands/prices.ts
@@ -9,6 +9,6 @@ export default defineCommand({
   async run({ args }) {
     const cache = await ensureCache();
     const rows = await cache.getPriceDistribution(args.site);
-    printTable(rows, { title: 'Price Distribution' });
+    printTable({ rows, options: { title: 'Price Distribution' } });
   },
 });
diff --git a/packages/cli/src/commands/ratings.ts b/packages/cli/src/commands/ratings.ts
index b42d008165..5bcdf27925 100644
--- a/packages/cli/src/commands/ratings.ts
+++ b/packages/cli/src/commands/ratings.ts
@@ -14,12 +14,15 @@ export default defineCommand({
     const cache = await ensureCache();
     const rows = await cache.getTopRated({
       category: args.category,
-      minReviews: parseNonNegativeNumberArg(args['min-reviews'], '--min-reviews'),
+      minReviews: parseNonNegativeNumberArg({
+        value: args['min-reviews'],
+        argName: '--min-reviews',
+      }),
       sites: parseCsvArg(args.sites),
-      limit: parsePositiveIntArg(args.limit, '--limit'),
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
     });
-    printTable(
-      rows.map(({ site, name, brand, rating_value, review_count, price, score }) => ({
+    printTable({
+      rows: rows.map(({ site, name, brand, rating_value, review_count, price, score }) => ({
         site,
         name: String(name).slice(0, 40),
         brand,
@@ -28,7 +31,7 @@ export default defineCommand({
         price,
         score,
       })),
-      { title: 'Top Rated Products' },
-    );
+      options: { title: 'Top Rated Products' },
+    });
   },
 });
diff --git a/packages/cli/src/commands/resolve.ts b/packages/cli/src/commands/resolve.ts
index 72c14c11d4..7331188812 100644
--- a/packages/cli/src/commands/resolve.ts
+++ b/packages/cli/src/commands/resolve.ts
@@ -27,22 +27,25 @@ export default defineCommand({
   async run({ args }) {
     const cache = await ensureCache();
     const conn = cache.getConnection();
-    const limit = parsePositiveIntArg(args.limit, '--limit');
+    const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' });
 
-    const resolver = new EntityResolver(conn);
+    const resolver = new EntityResolver({ conn });
 
     if (args.build) {
-      const minConfidence = parseConfidenceArg(args['min-confidence'], '--min-confidence');
+      const minConfidence = parseConfidenceArg({
+        value: args['min-confidence'],
+        argName: '--min-confidence',
+      });
       consola.start('Running entity resolution (this may take a while)...');
       const stats = await resolver.build(minConfidence);
-      printSummary(
-        {
+      printSummary({
+        data: {
           'Total listings': stats.total,
           'Unique products': stats.entities,
           'Dedup ratio': `${stats.dedupRatio}%`,
         },
-        'Entity Resolution Complete',
-      );
+        title: 'Entity Resolution Complete',
+      });
       return;
     }
 
@@ -51,14 +54,14 @@ export default defineCommand({
       return;
     }
 
-    const matches = await resolver.identifyProduct(args.product, limit);
+    const matches = await resolver.identifyProduct({ query: args.product, limit });
     if (matches.length === 0) {
       consola.warn('No matches. Run `packrat resolve --build` first.');
       return;
     }
 
-    printTable(
-      matches.map((m) => ({
+    printTable({
+      rows: matches.map((m) => ({
         'Canonical ID': String(m.canonical_id).slice(0, 8),
         Site: m.site,
         Name: String(m.name).slice(0, 35),
@@ -67,7 +70,7 @@ export default defineCommand({
         Confidence: m.confidence,
         Method: m.match_method,
       })),
-      { title: `Cross-site listings: "${args.product}"` },
-    );
+      options: { title: `Cross-site listings: "${args.product}"` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/reviews.ts b/packages/cli/src/commands/reviews.ts
index 8fe34f4665..cf08d19c75 100644
--- a/packages/cli/src/commands/reviews.ts
+++ b/packages/cli/src/commands/reviews.ts
@@ -14,22 +14,22 @@ export default defineCommand({
   async run({ args }) {
     const cache = await ensureCache();
     const conn = cache.getConnection();
-    const limit = parsePositiveIntArg(args.limit, '--limit');
+    const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' });
 
-    const enrichment = new Enrichment(conn);
+    const enrichment = new Enrichment({ conn });
 
     if (args.build) {
       consola.start('Building review aggregation...');
       const stats = await enrichment.buildReviews();
-      printSummary(
-        {
+      printSummary({
+        data: {
           'Total review entries': stats.total_reviews,
           'Products with reviews': stats.products_with_reviews,
           'Sites with reviews': stats.sites_with_reviews,
           'Average rating': stats.avg_rating,
         },
-        'Review Aggregation Complete',
-      );
+        title: 'Review Aggregation Complete',
+      });
       return;
     }
 
@@ -38,14 +38,14 @@ export default defineCommand({
       return;
     }
 
-    const reviews = await enrichment.getProductReviews(args.product, limit);
+    const reviews = await enrichment.getProductReviews({ query: args.product, limit });
     if (reviews.length === 0) {
       consola.warn('No reviews found. Run `packrat reviews --build` first.');
       return;
     }
 
-    printTable(
-      reviews.map((r) => ({
+    printTable({
+      rows: reviews.map((r) => ({
         Site: r.site,
         Name: String(r.name).slice(0, 40),
         Brand: r.brand,
@@ -55,7 +55,7 @@ export default defineCommand({
         'Wtd Avg': r.weighted_avg_rating,
         'Total Reviews': r.total_reviews,
       })),
-      { title: `Reviews: "${args.product}"` },
-    );
+      options: { title: `Reviews: "${args.product}"` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/sales.ts b/packages/cli/src/commands/sales.ts
index 5b2e877426..e5f66c57a8 100644
--- a/packages/cli/src/commands/sales.ts
+++ b/packages/cli/src/commands/sales.ts
@@ -13,20 +13,23 @@ export default defineCommand({
   async run({ args }) {
     const cache = await ensureCache();
     const rows = await cache.findSales({
-      minDiscountPct: parsePercentageArg(args['min-discount'], '--min-discount'),
+      minDiscountPct: parsePercentageArg({
+        value: args['min-discount'],
+        argName: '--min-discount',
+      }),
       category: args.category,
       sites: parseCsvArg(args.sites),
-      limit: parsePositiveIntArg(args.limit, '--limit'),
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
     });
-    printTable(
-      rows.map(({ site, name, price, compare_at_price, discount_pct }) => ({
+    printTable({
+      rows: rows.map(({ site, name, price, compare_at_price, discount_pct }) => ({
         site,
         name: String(name).slice(0, 40),
         price,
         was: compare_at_price,
         'off%': discount_pct,
       })),
-      { title: 'Items on Sale' },
-    );
+      options: { title: 'Items on Sale' },
+    });
   },
 });
diff --git a/packages/cli/src/commands/schema.ts b/packages/cli/src/commands/schema.ts
index e791a5e414..45b5b34939 100644
--- a/packages/cli/src/commands/schema.ts
+++ b/packages/cli/src/commands/schema.ts
@@ -57,6 +57,6 @@ export default defineCommand({
       return;
     }
 
-    printTable(rows, { title: 'Field Coverage by Site (%)' });
+    printTable({ rows, options: { title: 'Field Coverage by Site (%)' } });
   },
 });
diff --git a/packages/cli/src/commands/search.ts b/packages/cli/src/commands/search.ts
index 6c78695cc4..ff73e75074 100644
--- a/packages/cli/src/commands/search.ts
+++ b/packages/cli/src/commands/search.ts
@@ -13,18 +13,26 @@ export default defineCommand({
   },
   async run({ args }) {
     const cache = await ensureCache();
-    const limit = parsePositiveIntArg(args.limit, '--limit');
-    const rows = await cache.search(args.keyword, {
-      maxPrice: parseOptionalNumberArg(args['max-price'], '--max-price'),
-      minPrice: parseOptionalNumberArg(args['min-price'], '--min-price'),
-      sites: parseCsvArg(args.sites),
-      limit,
+    const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' });
+    const rows = await cache.search({
+      keyword: args.keyword,
+      options: {
+        maxPrice: parseOptionalNumberArg({ value: args['max-price'], argName: '--max-price' }),
+        minPrice: parseOptionalNumberArg({ value: args['min-price'], argName: '--min-price' }),
+        sites: parseCsvArg(args.sites),
+        limit,
+      },
     });
-    printTable(
-      rows.map(({ site, name, brand, price }) => ({ site, name: name.slice(0, 50), brand, price })),
-      {
+    printTable({
+      rows: rows.map(({ site, name, brand, price }) => ({
+        site,
+        name: name.slice(0, 50),
+        brand,
+        price,
+      })),
+      options: {
         title: `Search: "${args.keyword}"`,
       },
-    );
+    });
   },
 });
diff --git a/packages/cli/src/commands/seasons/index.ts b/packages/cli/src/commands/seasons/index.ts
index bf0580f2bb..40c4ae8d01 100644
--- a/packages/cli/src/commands/seasons/index.ts
+++ b/packages/cli/src/commands/seasons/index.ts
@@ -14,10 +14,10 @@ export default defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client['season-suggestions'].post({ location: args.location, date: args.date }),
-      { action: 'season suggestions' },
-    );
+    const data = await runApi({
+      promise: client['season-suggestions'].post({ location: args.location, date: args.date }),
+      action: 'season suggestions',
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
diff --git a/packages/cli/src/commands/specs.ts b/packages/cli/src/commands/specs.ts
index 90279cf33b..e247752af3 100644
--- a/packages/cli/src/commands/specs.ts
+++ b/packages/cli/src/commands/specs.ts
@@ -13,13 +13,13 @@ export default defineCommand({
     const cache = await ensureCache();
     const conn = cache.getConnection();
 
-    const parser = new SpecParser(conn);
-    const rows = await parser.getProductSpecs(
-      args.product,
-      parsePositiveIntArg(args.limit, '--limit'),
-    );
-    printTable(
-      rows.map(
+    const parser = new SpecParser({ conn });
+    const rows = await parser.getProductSpecs({
+      query: args.product,
+      limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }),
+    });
+    printTable({
+      rows: rows.map(
         ({
           name,
           brand,
@@ -42,7 +42,7 @@ export default defineCommand({
           fabric,
         }),
       ),
-      { title: `Specs: "${args.product}"` },
-    );
+      options: { title: `Specs: "${args.product}"` },
+    });
   },
 });
diff --git a/packages/cli/src/commands/stats.ts b/packages/cli/src/commands/stats.ts
index 55d9583cd8..55ff887eaf 100644
--- a/packages/cli/src/commands/stats.ts
+++ b/packages/cli/src/commands/stats.ts
@@ -6,6 +6,6 @@ export default defineCommand({
   async run() {
     const cache = await ensureCache();
     const rows = await cache.getSiteStats();
-    printTable(rows, { title: 'Site Statistics' });
+    printTable({ rows, options: { title: 'Site Statistics' } });
   },
 });
diff --git a/packages/cli/src/commands/summary.ts b/packages/cli/src/commands/summary.ts
index bbf95b451f..5828b4d8b7 100644
--- a/packages/cli/src/commands/summary.ts
+++ b/packages/cli/src/commands/summary.ts
@@ -6,8 +6,8 @@ export default defineCommand({
   async run() {
     const cache = await ensureCache();
     const data = await cache.getMarketSummary();
-    printSummary(
-      {
+    printSummary({
+      data: {
         'Total Items': data.totalItems.toLocaleString(),
         Sites: data.totalSites,
         Brands: data.totalBrands.toLocaleString(),
@@ -15,7 +15,7 @@ export default defineCommand({
         'Avg Price': `$${data.avgPrice.toFixed(2)}`,
         'In Stock': `${data.inStockPct}%`,
       },
-      'Market Summary',
-    );
+      title: 'Market Summary',
+    });
   },
 });
diff --git a/packages/cli/src/commands/templates/index.ts b/packages/cli/src/commands/templates/index.ts
index 83a5647c1d..319a961d57 100644
--- a/packages/cli/src/commands/templates/index.ts
+++ b/packages/cli/src/commands/templates/index.ts
@@ -11,20 +11,23 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client['pack-templates'].get(), { action: 'list pack templates' });
+    const data = await runApi({
+      promise: client['pack-templates'].get(),
+      action: 'list pack templates',
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(data).map((r) => ({
+    printTable({
+      rows: toRecordArray(data).map((r) => ({
         id: r.id,
         name: r.name,
         category: r.category,
         isApp: r.isAppTemplate,
       })),
-      { title: 'Pack templates' },
-    );
+      options: { title: 'Pack templates' },
+    });
   },
 });
 
@@ -34,7 +37,8 @@ const getCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client['pack-templates']({ templateId: args.id }).get(), {
+    const data = await runApi({
+      promise: client['pack-templates']({ templateId: args.id }).get(),
       action: 'get pack template',
       resourceHint: `template ${args.id}`,
     });
@@ -58,8 +62,8 @@ const createCmd = defineCommand({
     await requireAuth();
     const client = await getUserClient();
     const now = nowIso();
-    const data = await runApi(
-      client['pack-templates'].post({
+    const data = await runApi({
+      promise: client['pack-templates'].post({
         id: shortId('pt'),
         name: args.name,
         description: args.description,
@@ -68,8 +72,8 @@ const createCmd = defineCommand({
         localCreatedAt: now,
         localUpdatedAt: now,
       }),
-      { action: 'create pack template' },
-    );
+      action: 'create pack template',
+    });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
@@ -80,7 +84,8 @@ const deleteCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    await runApi(client['pack-templates']({ templateId: args.id }).delete(), {
+    await runApi({
+      promise: client['pack-templates']({ templateId: args.id }).delete(),
       action: 'delete pack template',
       resourceHint: `template ${args.id}`,
     });
diff --git a/packages/cli/src/commands/trails/index.ts b/packages/cli/src/commands/trails/index.ts
index eee3faed08..f3899d477f 100644
--- a/packages/cli/src/commands/trails/index.ts
+++ b/packages/cli/src/commands/trails/index.ts
@@ -19,8 +19,8 @@ const searchCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(
-      client.trails.search.get({
+    const data = await runApi({
+      promise: client.trails.search.get({
         query: {
           q: args.q,
           lat: args.lat ? Number.parseFloat(args.lat) : undefined,
@@ -31,21 +31,21 @@ const searchCmd = defineCommand({
           offset: Number.parseInt(args.offset, 10),
         },
       }),
-      { action: 'search trails' },
-    );
+      action: 'search trails',
+    });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(toRecord(data).trails).map((t) => ({
+    printTable({
+      rows: toRecordArray(toRecord(data).trails).map((t) => ({
         osmId: t.osmId,
         name: t.name,
         sport: t.sport,
         distance: t.distance,
       })),
-      { title: 'Trails' },
-    );
+      options: { title: 'Trails' },
+    });
   },
 });
 
@@ -55,7 +55,8 @@ const getCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const trail = await runApi(client.trails({ osmId: args.id }).get(), {
+    const trail = await runApi({
+      promise: client.trails({ osmId: args.id }).get(),
       action: 'get trail',
       resourceHint: `trail ${args.id}`,
     });
@@ -69,7 +70,8 @@ const geometryCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.trails({ osmId: args.id }).geometry.get(), {
+    const data = await runApi({
+      promise: client.trails({ osmId: args.id }).geometry.get(),
       action: 'get trail geometry',
       resourceHint: `trail ${args.id}`,
     });
diff --git a/packages/cli/src/commands/trends.ts b/packages/cli/src/commands/trends.ts
index 63ec2795d3..ceeff55438 100644
--- a/packages/cli/src/commands/trends.ts
+++ b/packages/cli/src/commands/trends.ts
@@ -10,14 +10,20 @@ export default defineCommand({
     site: { type: 'string', alias: 's', description: 'Filter to specific site' },
   },
   async run({ args }) {
-    const days = parsePositiveIntArg(args.days, '--days');
+    const days = parsePositiveIntArg({ value: args.days, argName: '--days' });
     const cache = await ensureCache();
-    const rows = await cache.searchTrends(args.keyword, {
-      site: args.site,
-      days,
+    const rows = await cache.searchTrends({
+      keyword: args.keyword,
+      options: {
+        site: args.site,
+        days,
+      },
     });
-    printTable(rows, {
-      title: `Price Trends: "${args.keyword}"`,
+    printTable({
+      rows,
+      options: {
+        title: `Price Trends: "${args.keyword}"`,
+      },
     });
   },
 });
diff --git a/packages/cli/src/commands/trips/index.ts b/packages/cli/src/commands/trips/index.ts
index 38a8e3f2cd..e6f7f60752 100644
--- a/packages/cli/src/commands/trips/index.ts
+++ b/packages/cli/src/commands/trips/index.ts
@@ -11,21 +11,21 @@ const listCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const trips = await runApi(client.trips.get(), { action: 'list trips' });
+    const trips = await runApi({ promise: client.trips.get(), action: 'list trips' });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(trips, null, 2)}\n`);
       return;
     }
-    printTable(
-      toRecordArray(trips).map((r) => ({
+    printTable({
+      rows: toRecordArray(trips).map((r) => ({
         id: r.id,
         name: r.name,
         startDate: r.startDate,
         endDate: r.endDate,
         packId: r.packId,
       })),
-      { title: 'Your trips' },
-    );
+      options: { title: 'Your trips' },
+    });
   },
 });
 
@@ -38,7 +38,8 @@ const getCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const trip = await runApi(client.trips({ tripId: args.id }).get(), {
+    const trip = await runApi({
+      promise: client.trips({ tripId: args.id }).get(),
       action: 'get trip',
       resourceHint: `trip ${args.id}`,
     });
@@ -47,8 +48,8 @@ const getCmd = defineCommand({
       return;
     }
     const t = toRecord(trip);
-    printSummary(
-      {
+    printSummary({
+      data: {
         id: t.id,
         name: t.name,
         description: t.description,
@@ -57,8 +58,8 @@ const getCmd = defineCommand({
         packId: t.packId,
         notes: t.notes,
       },
-      `Trip ${t.name ?? args.id}`,
-    );
+      title: `Trip ${t.name ?? args.id}`,
+    });
   },
 });
 
@@ -85,8 +86,8 @@ const createCmd = defineCommand({
       lat != null && lon != null && !Number.isNaN(lat) && !Number.isNaN(lon)
         ? { latitude: lat, longitude: lon, name: args['location-name'] }
         : null;
-    const trip = await runApi(
-      client.trips.post({
+    const trip = await runApi({
+      promise: client.trips.post({
         id: shortId('t'),
         name: args.name,
         description: args.description,
@@ -98,8 +99,8 @@ const createCmd = defineCommand({
         localCreatedAt: now,
         localUpdatedAt: now,
       }),
-      { action: 'create trip' },
-    );
+      action: 'create trip',
+    });
     process.stdout.write(`${JSON.stringify(trip, null, 2)}\n`);
   },
 });
@@ -110,7 +111,8 @@ const deleteCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    await runApi(client.trips({ tripId: args.id }).delete(), {
+    await runApi({
+      promise: client.trips({ tripId: args.id }).delete(),
       action: 'delete trip',
       resourceHint: `trip ${args.id}`,
     });
diff --git a/packages/cli/src/commands/user/index.ts b/packages/cli/src/commands/user/index.ts
index c116f5e87c..96af7dd03f 100644
--- a/packages/cli/src/commands/user/index.ts
+++ b/packages/cli/src/commands/user/index.ts
@@ -9,18 +9,18 @@ const getCmd = defineCommand({
   async run() {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.user.profile.get(), { action: 'get profile' });
+    const data = await runApi({ promise: client.user.profile.get(), action: 'get profile' });
     // Endpoint returns { success, user: { firstName, ... } }
     const user = toRecord(toRecord(data).user);
-    printSummary(
-      {
+    printSummary({
+      data: {
         firstName: user.firstName,
         lastName: user.lastName,
         email: user.email,
         avatarUrl: user.avatarUrl,
       },
-      'Profile',
-    );
+      title: 'Profile',
+    });
   },
 });
 
@@ -40,7 +40,7 @@ const updateCmd = defineCommand({
     if (args['last-name']) body.lastName = args['last-name'];
     if (args.email) body.email = args.email;
     if (args.avatar) body.avatarUrl = args.avatar;
-    const data = await runApi(client.user.profile.put(body), { action: 'update profile' });
+    const data = await runApi({ promise: client.user.profile.put(body), action: 'update profile' });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
   },
 });
diff --git a/packages/cli/src/commands/weather/index.ts b/packages/cli/src/commands/weather/index.ts
index 3d728332b5..0649994212 100644
--- a/packages/cli/src/commands/weather/index.ts
+++ b/packages/cli/src/commands/weather/index.ts
@@ -13,7 +13,8 @@ const forecastCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const forecast = await runApi(client.weather['by-name'].get({ query: { q: args.location } }), {
+    const forecast = await runApi({
+      promise: client.weather['by-name'].get({ query: { q: args.location } }),
       action: 'get weather forecast',
       resourceHint: args.location,
     });
@@ -27,7 +28,8 @@ const searchCmd = defineCommand({
   async run({ args }) {
     await requireAuth();
     const client = await getUserClient();
-    const data = await runApi(client.weather.search.get({ query: { q: args.q } }), {
+    const data = await runApi({
+      promise: client.weather.search.get({ query: { q: args.q } }),
       action: 'search weather',
     });
     process.stdout.write(`${JSON.stringify(data, null, 2)}\n`);
diff --git a/packages/cli/src/shared.ts b/packages/cli/src/shared.ts
index 2480e63acb..9d60431170 100644
--- a/packages/cli/src/shared.ts
+++ b/packages/cli/src/shared.ts
@@ -46,7 +46,13 @@ export async function ensureCache(forceRefresh = false): Promise<LocalCacheManag
 }
 
 /** Print an array of objects as a formatted CLI table. */
-export function printTable(rows: unknown[], options?: { title?: string }): void {
+export function printTable({
+  rows,
+  options,
+}: {
+  rows: unknown[];
+  options?: { title?: string };
+}): void {
   if (rows.length === 0) {
     consola.warn('No results found.');
     return;
@@ -73,7 +79,13 @@ export function printTable(rows: unknown[], options?: { title?: string }): void
 }
 
 /** Print a key-value summary. */
-export function printSummary(data: Record<string, unknown>, title?: string): void {
+export function printSummary({
+  data,
+  title,
+}: {
+  data: Record<string, unknown>;
+  title?: string;
+}): void {
   if (title) console.log(`\n${chalk.bold(title)}`);
 
   const table = new Table({ style: { head: [], border: [] } });
diff --git a/packages/env/scripts/no-raw-process-env.ts b/packages/env/scripts/no-raw-process-env.ts
index 37dfae6f4a..a6e68157ba 100644
--- a/packages/env/scripts/no-raw-process-env.ts
+++ b/packages/env/scripts/no-raw-process-env.ts
@@ -91,7 +91,7 @@ interface Violation {
 
 const violations: Violation[] = [];
 
-function walkDir(dir: string, relPath: string): void {
+function walkDir({ dir, relPath }: { dir: string; relPath: string }): void {
   let entries: string[];
   try {
     entries = readdirSync(dir);
@@ -113,7 +113,7 @@ function walkDir(dir: string, relPath: string): void {
     }
 
     if (isDir) {
-      walkDir(entryFull, entryRel);
+      walkDir({ dir: entryFull, relPath: entryRel });
     } else if (isTargetFile(entry)) {
       if (isAllowed(entryRel)) continue;
 
@@ -138,7 +138,7 @@ for (const root of SCAN_ROOTS) {
   const absRoot = join(ROOT, root);
   // For .github/scripts we use the relative path directly
   const relRoot = relative(ROOT, absRoot);
-  walkDir(absRoot, relRoot);
+  walkDir({ dir: absRoot, relPath: relRoot });
 }
 
 if (violations.length > 0) {
diff --git a/packages/guards/src/assertions.ts b/packages/guards/src/assertions.ts
index 86145d9a56..e55e643f8d 100644
--- a/packages/guards/src/assertions.ts
+++ b/packages/guards/src/assertions.ts
@@ -48,10 +48,13 @@ export function assertIsBoolean(
   if (typeof value !== 'boolean') throw new Error(message);
 }
 
-export function assertAllDefined(
-  values: readonly unknown[],
+export function assertAllDefined({
+  values,
   message = 'All values must be defined',
-): void {
+}: {
+  values: readonly unknown[];
+  message?: string;
+}): void {
   for (let i = 0; i < values.length; i++) {
     if (values[i] === undefined) {
       throw new Error(`${message} (index ${i})`);
diff --git a/packages/guards/src/narrow.ts b/packages/guards/src/narrow.ts
index 3c89746f57..adb377c991 100644
--- a/packages/guards/src/narrow.ts
+++ b/packages/guards/src/narrow.ts
@@ -128,10 +128,13 @@ export const nullToUndefined = <T>(value: T | null): T | undefined =>
  * Type-safe indexOf — searches an array for an unknown value and returns its
  * index, or -1 if the value is not a member of the array.
  *
+ * Avoids `as ElementType` casts when the call site only has a `string` (or
+ * other broad type) but the array is typed as a specific union or tuple.
+ *
  * @example
- * safeIndexOf(['g', 'oz', 'kg', 'lb'], field.state.value)  // 0-3 or -1
+ * safeIndexOf({ array: ['g', 'oz', 'kg', 'lb'], value: field.state.value })  // 0-3 or -1
  */
-export const safeIndexOf = <T>(array: readonly T[], value: unknown): number =>
+export const safeIndexOf = <T>({ array, value }: { array: readonly T[]; value: unknown }): number =>
   (array as readonly unknown[]).indexOf(value); // safe-cast: search is read-only; result is a numeric index, no narrowing on T
 
 /**
diff --git a/packages/mcp/src/auth.ts b/packages/mcp/src/auth.ts
index aff3cc0d39..7a18b6eafd 100644
--- a/packages/mcp/src/auth.ts
+++ b/packages/mcp/src/auth.ts
@@ -65,7 +65,7 @@ function escapeHtml(s: string): string {
     .replace(QUOT_RE, '&quot;');
 }
 
-function loginPage(state: string, error?: string): string {
+function loginPage({ state, error }: { state: string; error?: string }): string {
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -105,7 +105,13 @@ function loginPage(state: string, error?: string): string {
 }
 
 /** FormData.get() returns FormDataEntryValue | null (string | File | null). Extract string only. */
-function getFormString(data: { get(name: string): string | File | null }, key: string): string {
+function getFormString({
+  data,
+  key,
+}: {
+  data: { get(name: string): string | File | null };
+  key: string;
+}): string {
   const val = data.get(key);
   return isString(val) ? val : '';
 }
@@ -129,15 +135,17 @@ export const PackRatAuthHandler = {
     }
 
     if (url.pathname === '/authorize') {
-      return handleAuthorize(request, env);
+      return handleAuthorize({ request, env });
     }
 
     if (url.pathname === '/login') {
-      return request.method === 'POST' ? handleLoginPost(request, env) : handleLoginGet(request);
+      return request.method === 'POST'
+        ? handleLoginPost({ request, env })
+        : handleLoginGet(request);
     }
 
     if (url.pathname === '/callback') {
-      return handleCallback(request, env);
+      return handleCallback({ request, env });
     }
 
     return Response.json({ error: 'Not Found' }, { status: 404 });
@@ -146,7 +154,13 @@ export const PackRatAuthHandler = {
 
 // ── /authorize ────────────────────────────────────────────────────────────────
 
-async function handleAuthorize(request: Request, env: Env): Promise<Response> {
+async function handleAuthorize({
+  request,
+  env,
+}: {
+  request: Request;
+  env: Env;
+}): Promise<Response> {
   let oauthReq: z.infer<typeof OAuthStateSchema>;
   try {
     const parsed = await env.OAUTH_PROVIDER.parseAuthRequest(request);
@@ -174,32 +188,38 @@ async function handleAuthorize(request: Request, env: Env): Promise<Response> {
 
 function handleLoginGet(request: Request): Response {
   const state = new URL(request.url).searchParams.get('state') ?? '';
-  return new Response(loginPage(state), {
+  return new Response(loginPage({ state }), {
     headers: { 'Content-Type': 'text/html; charset=utf-8' },
   });
 }
 
 // ── /login POST ───────────────────────────────────────────────────────────────
 
-async function handleLoginPost(request: Request, env: Env): Promise<Response> {
+async function handleLoginPost({
+  request,
+  env,
+}: {
+  request: Request;
+  env: Env;
+}): Promise<Response> {
   let email: string;
   let password: string;
   let state: string;
 
   try {
     const form = await request.formData();
-    email = getFormString(form, 'email');
-    password = getFormString(form, 'password');
-    state = getFormString(form, 'state');
+    email = getFormString({ data: form, key: 'email' });
+    password = getFormString({ data: form, key: 'password' });
+    state = getFormString({ data: form, key: 'state' });
   } catch {
-    return new Response(loginPage('', 'Invalid form submission.'), {
+    return new Response(loginPage({ state: '', error: 'Invalid form submission.' }), {
       status: 400,
       headers: { 'Content-Type': 'text/html; charset=utf-8' },
     });
   }
 
   if (!email || !password || !state) {
-    return new Response(loginPage(state, 'Email and password are required.'), {
+    return new Response(loginPage({ state, error: 'Email and password are required.' }), {
       status: 400,
       headers: { 'Content-Type': 'text/html; charset=utf-8' },
     });
@@ -207,7 +227,7 @@ async function handleLoginPost(request: Request, env: Env): Promise<Response> {
 
   const oauthReqStr = await env.OAUTH_KV.get(oauthStateKey(state));
   if (!oauthReqStr) {
-    return new Response(loginPage(state, 'Session expired. Please start over.'), {
+    return new Response(loginPage({ state, error: 'Session expired. Please start over.' }), {
       status: 400,
       headers: { 'Content-Type': 'text/html; charset=utf-8' },
     });
@@ -221,14 +241,14 @@ async function handleLoginPost(request: Request, env: Env): Promise<Response> {
       body: JSON.stringify({ email, password }),
     });
   } catch {
-    return new Response(loginPage(state, 'Could not reach PackRat. Try again.'), {
+    return new Response(loginPage({ state, error: 'Could not reach PackRat. Try again.' }), {
       status: 502,
       headers: { 'Content-Type': 'text/html; charset=utf-8' },
     });
   }
 
   if (!signInRes.ok) {
-    return new Response(loginPage(state, 'Invalid email or password.'), {
+    return new Response(loginPage({ state, error: 'Invalid email or password.' }), {
       status: 401,
       headers: { 'Content-Type': 'text/html; charset=utf-8' },
     });
@@ -239,10 +259,13 @@ async function handleLoginPost(request: Request, env: Env): Promise<Response> {
   const userId = signInResult.success ? signInResult.data.user?.id : undefined;
 
   if (!betterAuthToken || !userId) {
-    return new Response(loginPage(state, 'Sign-in succeeded but session data was missing.'), {
-      status: 502,
-      headers: { 'Content-Type': 'text/html; charset=utf-8' },
-    });
+    return new Response(
+      loginPage({ state, error: 'Sign-in succeeded but session data was missing.' }),
+      {
+        status: 502,
+        headers: { 'Content-Type': 'text/html; charset=utf-8' },
+      },
+    );
   }
 
   await env.OAUTH_KV.put(sessionKey(state), JSON.stringify({ token: betterAuthToken, userId }), {
@@ -256,7 +279,7 @@ async function handleLoginPost(request: Request, env: Env): Promise<Response> {
 
 // ── /callback ─────────────────────────────────────────────────────────────────
 
-async function handleCallback(request: Request, env: Env): Promise<Response> {
+async function handleCallback({ request, env }: { request: Request; env: Env }): Promise<Response> {
   const state = new URL(request.url).searchParams.get('state') ?? '';
 
   const [oauthReqStr, sessionStr] = await Promise.all([
diff --git a/packages/mcp/src/client.ts b/packages/mcp/src/client.ts
index fc0cc1cd6a..4ab69eaa6e 100644
--- a/packages/mcp/src/client.ts
+++ b/packages/mcp/src/client.ts
@@ -97,9 +97,9 @@ export type CallOptions = {
  * Thrown errors and `{ error: ... }` responses both surface as `isError: true`.
  */
 export async function call<T>(
-  promise: Promise<TreatyResponse<T>>,
-  options: CallOptions = {},
+  args: { promise: Promise<TreatyResponse<T>> } & CallOptions,
 ): Promise<McpToolResult> {
+  const { promise, ...options } = args;
   try {
     const result = await promise;
     if (result.error || result.data == null) {
diff --git a/packages/mcp/src/index.ts b/packages/mcp/src/index.ts
index 443a362bab..2c4feb4c46 100644
--- a/packages/mcp/src/index.ts
+++ b/packages/mcp/src/index.ts
@@ -131,7 +131,7 @@ export class PackRatMCP extends McpAgent<Env, State, Record<string, never>> {
    * Register a tool gated on a feature flag. The tool is hidden unless the
    * flag is present in `MCP_FEATURE_FLAGS` or enabled via `setFeatureFlag`.
    */
-  registerFlaggedTool: AgentContext['registerFlaggedTool'] = (flag, ...args) => {
+  registerFlaggedTool: AgentContext['registerFlaggedTool'] = ({ flag, args }) => {
     // safe-cast: McpServer.registerTool's overloads collapse at the implementation level;
     // forwarding via spread requires a single call signature here.
     const tool = (this.server.registerTool as (...a: unknown[]) => RegisteredTool)(...args);
@@ -142,7 +142,7 @@ export class PackRatMCP extends McpAgent<Env, State, Record<string, never>> {
     return tool;
   };
 
-  setFeatureFlag(flag: string, enabled: boolean): void {
+  setFeatureFlag({ flag, enabled }: { flag: string; enabled: boolean }): void {
     this._flagState.set(flag, enabled);
     for (const tool of this._flaggedTools.get(flag) ?? []) {
       if (enabled && !tool.enabled) tool.enable();
diff --git a/packages/mcp/src/resources.ts b/packages/mcp/src/resources.ts
index 02ec04b94f..e5785a81f3 100644
--- a/packages/mcp/src/resources.ts
+++ b/packages/mcp/src/resources.ts
@@ -18,10 +18,9 @@ function resourceError(opts: { uri: string; context: string; status: number; val
   return { uri, context, status, error: message };
 }
 
-function asContent(
-  uri: string,
-  body: object,
-): { contents: Array<{ uri: string; mimeType: string; text: string }> } {
+function asContent({ uri, body }: { uri: string; body: object }): {
+  contents: Array<{ uri: string; mimeType: string; text: string }>;
+} {
   return {
     contents: [{ uri, mimeType: 'application/json', text: JSON.stringify(body, null, 2) }],
   };
@@ -36,14 +35,20 @@ async function settle(args: {
   try {
     const { data, error, status } = await promise;
     if (error || data == null) {
-      return asContent(uri, resourceError({ uri, context, status, value: error?.value ?? null }));
+      return asContent({
+        uri,
+        body: resourceError({ uri, context, status, value: error?.value ?? null }),
+      });
     }
-    return asContent(uri, data as object);
+    return asContent({ uri, body: data as object });
   } catch (e) {
-    return asContent(uri, {
+    return asContent({
       uri,
-      context,
-      error: e instanceof Error ? e.message : String(e),
+      body: {
+        uri,
+        context,
+        error: e instanceof Error ? e.message : String(e),
+      },
     });
   }
 }
diff --git a/packages/mcp/src/tools/admin.ts b/packages/mcp/src/tools/admin.ts
index 98b4ec8e3f..51e813ef5c 100644
--- a/packages/mcp/src/tools/admin.ts
+++ b/packages/mcp/src/tools/admin.ts
@@ -22,7 +22,8 @@ export function registerAdminTools(agent: AgentContext): void {
       description: 'Get high-level platform stats: user, pack, and catalog counts.',
       inputSchema: {},
     },
-    async () => call(agent.api.admin.admin.stats.get(), { action: 'fetch admin stats', ...ADMIN }),
+    async () =>
+      call({ promise: agent.api.admin.admin.stats.get(), action: 'fetch admin stats', ...ADMIN }),
   );
 
   agent.registerAdminTool(
@@ -36,7 +37,8 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ q, limit, offset }) =>
-      call(agent.api.admin.admin['users-list'].get({ query: { q, limit, offset } }), {
+      call({
+        promise: agent.api.admin.admin['users-list'].get({ query: { q, limit, offset } }),
         action: 'list users',
         ...ADMIN,
       }),
@@ -50,7 +52,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { user_id: z.string(), reason: z.string().min(1) },
     },
     async ({ user_id, reason }) =>
-      call(agent.api.admin.admin.users({ id: user_id }).hard.delete({ reason }), {
+      call({
+        promise: agent.api.admin.admin.users({ id: user_id }).hard.delete({ reason }),
         action: 'hard-delete user',
         resourceHint: `user ${user_id}`,
         ...ADMIN,
@@ -69,12 +72,13 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ q, limit, offset, include_deleted }) =>
-      call(
-        agent.api.admin.admin['packs-list'].get({
+      call({
+        promise: agent.api.admin.admin['packs-list'].get({
           query: { q, limit, offset, includeDeleted: include_deleted },
         }),
-        { action: 'list packs (admin)', ...ADMIN },
-      ),
+        action: 'list packs (admin)',
+        ...ADMIN,
+      }),
   );
 
   agent.registerAdminTool(
@@ -84,7 +88,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { pack_id: z.string() },
     },
     async ({ pack_id }) =>
-      call(agent.api.admin.admin.packs({ id: pack_id }).delete(), {
+      call({
+        promise: agent.api.admin.admin.packs({ id: pack_id }).delete(),
         action: 'admin delete pack',
         resourceHint: `pack ${pack_id}`,
         ...ADMIN,
@@ -102,7 +107,8 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ q, limit, offset }) =>
-      call(agent.api.admin.admin['catalog-list'].get({ query: { q, limit, offset } }), {
+      call({
+        promise: agent.api.admin.admin['catalog-list'].get({ query: { q, limit, offset } }),
         action: 'list catalog (admin)',
         ...ADMIN,
       }),
@@ -132,7 +138,8 @@ export function registerAdminTools(agent: AgentContext): void {
       if (weight_unit !== undefined) body.weightUnit = weight_unit;
       if (price !== undefined) body.price = price;
       if (description !== undefined) body.description = description;
-      return call(agent.api.admin.admin.catalog({ id: String(item_id) }).patch(body), {
+      return call({
+        promise: agent.api.admin.admin.catalog({ id: String(item_id) }).patch(body),
         action: 'admin update catalog item',
         resourceHint: `catalog item ${item_id}`,
         ...ADMIN,
@@ -147,7 +154,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { item_id: z.union([z.string(), z.number()]) },
     },
     async ({ item_id }) =>
-      call(agent.api.admin.admin.catalog({ id: String(item_id) }).delete(), {
+      call({
+        promise: agent.api.admin.admin.catalog({ id: String(item_id) }).delete(),
         action: 'admin delete catalog item',
         resourceHint: `catalog item ${item_id}`,
         ...ADMIN,
@@ -168,7 +176,8 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ q, sport, limit, offset }) =>
-      call(agent.api.admin.admin.trails.search.get({ query: { q, sport, limit, offset } }), {
+      call({
+        promise: agent.api.admin.admin.trails.search.get({ query: { q, sport, limit, offset } }),
         action: 'admin search trails',
         ...ADMIN,
       }),
@@ -181,7 +190,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { osm_id: z.string() },
     },
     async ({ osm_id }) =>
-      call(agent.api.admin.admin.trails({ osmId: osm_id }).get(), {
+      call({
+        promise: agent.api.admin.admin.trails({ osmId: osm_id }).get(),
         action: 'admin get trail',
         resourceHint: `trail ${osm_id}`,
         ...ADMIN,
@@ -195,7 +205,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { osm_id: z.string() },
     },
     async ({ osm_id }) =>
-      call(agent.api.admin.admin.trails({ osmId: osm_id }).geometry.get(), {
+      call({
+        promise: agent.api.admin.admin.trails({ osmId: osm_id }).geometry.get(),
         action: 'admin get trail geometry',
         resourceHint: `trail ${osm_id}`,
         ...ADMIN,
@@ -214,12 +225,13 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ q, limit, offset, include_deleted }) =>
-      call(
-        agent.api.admin.admin.trails.conditions.get({
+      call({
+        promise: agent.api.admin.admin.trails.conditions.get({
           query: { q, limit, offset, includeDeleted: include_deleted },
         }),
-        { action: 'list trail condition reports (admin)', ...ADMIN },
-      ),
+        action: 'list trail condition reports (admin)',
+        ...ADMIN,
+      }),
   );
 
   agent.registerAdminTool(
@@ -229,7 +241,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { report_id: z.string() },
     },
     async ({ report_id }) =>
-      call(agent.api.admin.admin.trails.conditions({ reportId: report_id }).delete(), {
+      call({
+        promise: agent.api.admin.admin.trails.conditions({ reportId: report_id }).delete(),
         action: 'admin delete trail report',
         resourceHint: `report ${report_id}`,
         ...ADMIN,
@@ -248,7 +261,8 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ period, range }) =>
-      call(agent.api.admin.admin.analytics.platform.growth.get({ query: { period, range } }), {
+      call({
+        promise: agent.api.admin.admin.analytics.platform.growth.get({ query: { period, range } }),
         action: 'admin analytics growth',
         ...ADMIN,
       }),
@@ -264,7 +278,10 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ period, range }) =>
-      call(agent.api.admin.admin.analytics.platform.activity.get({ query: { period, range } }), {
+      call({
+        promise: agent.api.admin.admin.analytics.platform.activity.get({
+          query: { period, range },
+        }),
         action: 'admin analytics activity',
         ...ADMIN,
       }),
@@ -277,7 +294,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.platform['active-users'].get(), {
+      call({
+        promise: agent.api.admin.admin.analytics.platform['active-users'].get(),
         action: 'admin analytics active users',
         ...ADMIN,
       }),
@@ -290,7 +308,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.platform.breakdown.get(), {
+      call({
+        promise: agent.api.admin.admin.analytics.platform.breakdown.get(),
         action: 'admin analytics breakdown',
         ...ADMIN,
       }),
@@ -305,7 +324,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.catalog.overview.get(), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.overview.get(),
         action: 'admin catalog overview',
         ...ADMIN,
       }),
@@ -318,7 +338,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { limit: z.number().int().min(1).max(200).default(20) },
     },
     async ({ limit }) =>
-      call(agent.api.admin.admin.analytics.catalog.brands.get({ query: { limit } }), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.brands.get({ query: { limit } }),
         action: 'admin catalog brands',
         ...ADMIN,
       }),
@@ -331,7 +352,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.catalog.prices.get(), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.prices.get(),
         action: 'admin catalog prices',
         ...ADMIN,
       }),
@@ -344,7 +366,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.catalog.embeddings.get(), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.embeddings.get(),
         action: 'admin catalog embedding stats',
         ...ADMIN,
       }),
@@ -357,7 +380,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { limit: z.number().int().min(1).max(200).default(20) },
     },
     async ({ limit }) =>
-      call(agent.api.admin.admin.analytics.catalog.etl.get({ query: { limit } }), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.etl.get({ query: { limit } }),
         action: 'admin ETL jobs',
         ...ADMIN,
       }),
@@ -370,10 +394,13 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { limit: z.number().int().min(1).max(50).default(10) },
     },
     async ({ limit }) =>
-      call(
-        agent.api.admin.admin.analytics.catalog.etl['failure-summary'].get({ query: { limit } }),
-        { action: 'admin ETL failure summary', ...ADMIN },
-      ),
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.etl['failure-summary'].get({
+          query: { limit },
+        }),
+        action: 'admin ETL failure summary',
+        ...ADMIN,
+      }),
   );
 
   agent.registerAdminTool(
@@ -386,12 +413,14 @@ export function registerAdminTools(agent: AgentContext): void {
       },
     },
     async ({ job_id, limit }) =>
-      call(
-        agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).failures.get({
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).failures.get({
           query: { limit },
         }),
-        { action: 'admin ETL job failures', resourceHint: `job ${job_id}`, ...ADMIN },
-      ),
+        action: 'admin ETL job failures',
+        resourceHint: `job ${job_id}`,
+        ...ADMIN,
+      }),
   );
 
   agent.registerAdminTool(
@@ -401,7 +430,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.admin.admin.analytics.catalog.etl['reset-stuck'].post({}), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.etl['reset-stuck'].post({}),
         action: 'admin ETL reset stuck',
         ...ADMIN,
       }),
@@ -414,7 +444,8 @@ export function registerAdminTools(agent: AgentContext): void {
       inputSchema: { job_id: z.string() },
     },
     async ({ job_id }) =>
-      call(agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).retry.post({}), {
+      call({
+        promise: agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).retry.post({}),
         action: 'admin ETL retry job',
         resourceHint: `job ${job_id}`,
         ...ADMIN,
diff --git a/packages/mcp/src/tools/ai.ts b/packages/mcp/src/tools/ai.ts
index f825f414b7..af17ea552b 100644
--- a/packages/mcp/src/tools/ai.ts
+++ b/packages/mcp/src/tools/ai.ts
@@ -13,7 +13,8 @@ export function registerAiTools(agent: AgentContext): void {
       inputSchema: { query: z.string().min(3) },
     },
     async ({ query }) =>
-      call(agent.api.user.ai['web-search'].get({ query: { q: query } }), {
+      call({
+        promise: agent.api.user.ai['web-search'].get({ query: { q: query } }),
         action: 'web search',
       }),
   );
@@ -31,7 +32,8 @@ export function registerAiTools(agent: AgentContext): void {
       },
     },
     async ({ query, limit }) =>
-      call(agent.api.user.ai['execute-sql'].post({ query, limit }), {
+      call({
+        promise: agent.api.user.ai['execute-sql'].post({ query, limit }),
         action: 'execute SQL',
       }),
   );
@@ -44,6 +46,6 @@ export function registerAiTools(agent: AgentContext): void {
       description: 'Get the PackRat DB schema — table names, columns, types.',
       inputSchema: {},
     },
-    async () => call(agent.api.user.ai['db-schema'].get(), { action: 'fetch DB schema' }),
+    async () => call({ promise: agent.api.user.ai['db-schema'].get(), action: 'fetch DB schema' }),
   );
 }
diff --git a/packages/mcp/src/tools/alltrails.ts b/packages/mcp/src/tools/alltrails.ts
index 9ab801c0b3..1e0f7c3b66 100644
--- a/packages/mcp/src/tools/alltrails.ts
+++ b/packages/mcp/src/tools/alltrails.ts
@@ -11,7 +11,8 @@ export function registerAlltrailsTools(agent: AgentContext): void {
       inputSchema: { url: z.string().url() },
     },
     async ({ url }) =>
-      call(agent.api.user.alltrails.preview.post({ url }), {
+      call({
+        promise: agent.api.user.alltrails.preview.post({ url }),
         action: 'preview AllTrails URL',
         resourceHint: url,
       }),
diff --git a/packages/mcp/src/tools/auth.ts b/packages/mcp/src/tools/auth.ts
index ab016c3118..c13c0f0af5 100644
--- a/packages/mcp/src/tools/auth.ts
+++ b/packages/mcp/src/tools/auth.ts
@@ -25,7 +25,7 @@ export function registerAuthTools(agent: AgentContext): void {
       description: 'Return the currently authenticated PackRat user profile.',
       inputSchema: {},
     },
-    async () => call(agent.api.user.user.profile.get(), { action: 'fetch profile' }),
+    async () => call({ promise: agent.api.user.user.profile.get(), action: 'fetch profile' }),
   );
 
   // ── Admin login ───────────────────────────────────────────────────────────
diff --git a/packages/mcp/src/tools/catalog.ts b/packages/mcp/src/tools/catalog.ts
index ec6cfa7d5c..89d8ac6f10 100644
--- a/packages/mcp/src/tools/catalog.ts
+++ b/packages/mcp/src/tools/catalog.ts
@@ -29,8 +29,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       },
     },
     async ({ query, category, limit, page, sort_by, sort_order }) =>
-      call(
-        agent.api.user.catalog.get({
+      call({
+        promise: agent.api.user.catalog.get({
           query: {
             q: query,
             category,
@@ -39,8 +39,8 @@ export function registerCatalogTools(agent: AgentContext): void {
             sort: sort_by ? { field: sort_by, order: sort_order } : undefined,
           },
         }),
-        { action: 'search catalog' },
-      ),
+        action: 'search catalog',
+      }),
   );
 
   // ── Semantic/vector search ────────────────────────────────────────────────
@@ -56,7 +56,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       },
     },
     async ({ query, limit }) =>
-      call(agent.api.user.catalog['vector-search'].get({ query: { q: query, limit } }), {
+      call({
+        promise: agent.api.user.catalog['vector-search'].get({ query: { q: query, limit } }),
         action: 'semantic catalog search',
       }),
   );
@@ -73,7 +74,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       },
     },
     async ({ item_id }) =>
-      call(agent.api.user.catalog({ id: String(item_id) }).get(), {
+      call({
+        promise: agent.api.user.catalog({ id: String(item_id) }).get(),
         action: 'get catalog item',
         resourceHint: `catalog item ${item_id}`,
       }),
@@ -92,12 +94,13 @@ export function registerCatalogTools(agent: AgentContext): void {
       },
     },
     async ({ item_id, limit, threshold }) =>
-      call(
-        agent.api.user.catalog({ id: String(item_id) }).similar.get({
+      call({
+        promise: agent.api.user.catalog({ id: String(item_id) }).similar.get({
           query: { limit, ...(threshold !== undefined ? { threshold } : {}) },
         }),
-        { action: 'find similar catalog items', resourceHint: `catalog item ${item_id}` },
-      ),
+        action: 'find similar catalog items',
+        resourceHint: `catalog item ${item_id}`,
+      }),
   );
 
   // ── List categories ───────────────────────────────────────────────────────
@@ -110,7 +113,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       inputSchema: { limit: z.number().int().min(1).max(200).optional() },
     },
     async ({ limit }) =>
-      call(agent.api.user.catalog.categories.get({ query: { limit } }), {
+      call({
+        promise: agent.api.user.catalog.categories.get({ query: { limit } }),
         action: 'list catalog categories',
       }),
   );
@@ -147,8 +151,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       rating,
       product_url,
     }) =>
-      call(
-        agent.api.user.catalog.post({
+      call({
+        promise: agent.api.user.catalog.post({
           name,
           description,
           brand,
@@ -160,8 +164,8 @@ export function registerCatalogTools(agent: AgentContext): void {
           rating,
           productUrl: product_url,
         }),
-        { action: 'create catalog item' },
-      ),
+        action: 'create catalog item',
+      }),
   );
 
   // ── Compare items (API-side path proposed; until then, multi-fetch) ───────
@@ -178,7 +182,8 @@ export function registerCatalogTools(agent: AgentContext): void {
       },
     },
     async ({ item_ids }) =>
-      call(agent.api.user.catalog.compare.post({ ids: item_ids }), {
+      call({
+        promise: agent.api.user.catalog.compare.post({ ids: item_ids }),
         action: 'compare catalog items',
       }),
   );
diff --git a/packages/mcp/src/tools/feed.ts b/packages/mcp/src/tools/feed.ts
index 9293d65bc0..6c2562a72e 100644
--- a/packages/mcp/src/tools/feed.ts
+++ b/packages/mcp/src/tools/feed.ts
@@ -15,7 +15,7 @@ export function registerFeedTools(agent: AgentContext): void {
       },
     },
     async ({ page, limit }) =>
-      call(agent.api.user.feed.get({ query: { page, limit } }), { action: 'list feed' }),
+      call({ promise: agent.api.user.feed.get({ query: { page, limit } }), action: 'list feed' }),
   );
 
   agent.server.registerTool(
@@ -28,7 +28,8 @@ export function registerFeedTools(agent: AgentContext): void {
       },
     },
     async ({ caption, images }) =>
-      call(agent.api.user.feed.post({ caption, images: images ?? [] }), {
+      call({
+        promise: agent.api.user.feed.post({ caption, images: images ?? [] }),
         action: 'create feed post',
       }),
   );
@@ -40,7 +41,8 @@ export function registerFeedTools(agent: AgentContext): void {
       inputSchema: { post_id: z.string() },
     },
     async ({ post_id }) =>
-      call(agent.api.user.feed({ postId: post_id }).get(), {
+      call({
+        promise: agent.api.user.feed({ postId: post_id }).get(),
         action: 'get feed post',
         resourceHint: `post ${post_id}`,
       }),
@@ -53,7 +55,8 @@ export function registerFeedTools(agent: AgentContext): void {
       inputSchema: { post_id: z.string() },
     },
     async ({ post_id }) =>
-      call(agent.api.user.feed({ postId: post_id }).delete(), {
+      call({
+        promise: agent.api.user.feed({ postId: post_id }).delete(),
         action: 'delete feed post',
         resourceHint: `post ${post_id}`,
       }),
@@ -66,7 +69,8 @@ export function registerFeedTools(agent: AgentContext): void {
       inputSchema: { post_id: z.string() },
     },
     async ({ post_id }) =>
-      call(agent.api.user.feed({ postId: post_id }).like.post({}), {
+      call({
+        promise: agent.api.user.feed({ postId: post_id }).like.post({}),
         action: 'toggle feed post like',
         resourceHint: `post ${post_id}`,
       }),
@@ -85,7 +89,8 @@ export function registerFeedTools(agent: AgentContext): void {
       },
     },
     async ({ post_id, page, limit }) =>
-      call(agent.api.user.feed({ postId: post_id }).comments.get({ query: { page, limit } }), {
+      call({
+        promise: agent.api.user.feed({ postId: post_id }).comments.get({ query: { page, limit } }),
         action: 'list feed comments',
         resourceHint: `post ${post_id}`,
       }),
@@ -102,13 +107,14 @@ export function registerFeedTools(agent: AgentContext): void {
       },
     },
     async ({ post_id, content, parent_comment_id }) =>
-      call(
-        agent.api.user.feed({ postId: post_id }).comments.post({
+      call({
+        promise: agent.api.user.feed({ postId: post_id }).comments.post({
           content,
           parentCommentId: parent_comment_id,
         }),
-        { action: 'create feed comment', resourceHint: `post ${post_id}` },
-      ),
+        action: 'create feed comment',
+        resourceHint: `post ${post_id}`,
+      }),
   );
 
   agent.server.registerTool(
@@ -118,7 +124,11 @@ export function registerFeedTools(agent: AgentContext): void {
       inputSchema: { post_id: z.string(), comment_id: z.string() },
     },
     async ({ post_id, comment_id }) =>
-      call(agent.api.user.feed({ postId: post_id }).comments({ commentId: comment_id }).delete(), {
+      call({
+        promise: agent.api.user
+          .feed({ postId: post_id })
+          .comments({ commentId: comment_id })
+          .delete(),
         action: 'delete feed comment',
         resourceHint: `comment ${comment_id}`,
       }),
@@ -131,9 +141,13 @@ export function registerFeedTools(agent: AgentContext): void {
       inputSchema: { post_id: z.string(), comment_id: z.string() },
     },
     async ({ post_id, comment_id }) =>
-      call(
-        agent.api.user.feed({ postId: post_id }).comments({ commentId: comment_id }).like.post({}),
-        { action: 'toggle feed comment like', resourceHint: `comment ${comment_id}` },
-      ),
+      call({
+        promise: agent.api.user
+          .feed({ postId: post_id })
+          .comments({ commentId: comment_id })
+          .like.post({}),
+        action: 'toggle feed comment like',
+        resourceHint: `comment ${comment_id}`,
+      }),
   );
 }
diff --git a/packages/mcp/src/tools/guides.ts b/packages/mcp/src/tools/guides.ts
index 151da3e795..cdcc1eda6f 100644
--- a/packages/mcp/src/tools/guides.ts
+++ b/packages/mcp/src/tools/guides.ts
@@ -17,8 +17,8 @@ export function registerGuidesTools(agent: AgentContext): void {
       },
     },
     async ({ page, limit, category, sort_field, sort_order }) =>
-      call(
-        agent.api.user.guides.get({
+      call({
+        promise: agent.api.user.guides.get({
           query: {
             page,
             limit,
@@ -27,8 +27,8 @@ export function registerGuidesTools(agent: AgentContext): void {
             'sort[order]': sort_order,
           },
         }),
-        { action: 'list guides' },
-      ),
+        action: 'list guides',
+      }),
   );
 
   agent.server.registerTool(
@@ -37,7 +37,8 @@ export function registerGuidesTools(agent: AgentContext): void {
       description: 'List all guide categories.',
       inputSchema: {},
     },
-    async () => call(agent.api.user.guides.categories.get(), { action: 'list guide categories' }),
+    async () =>
+      call({ promise: agent.api.user.guides.categories.get(), action: 'list guide categories' }),
   );
 
   agent.server.registerTool(
@@ -52,7 +53,8 @@ export function registerGuidesTools(agent: AgentContext): void {
       },
     },
     async ({ query, page, limit, category }) =>
-      call(agent.api.user.guides.search.get({ query: { q: query, page, limit, category } }), {
+      call({
+        promise: agent.api.user.guides.search.get({ query: { q: query, page, limit, category } }),
         action: 'search guides',
       }),
   );
@@ -64,7 +66,8 @@ export function registerGuidesTools(agent: AgentContext): void {
       inputSchema: { guide_id: z.string() },
     },
     async ({ guide_id }) =>
-      call(agent.api.user.guides({ id: guide_id }).get(), {
+      call({
+        promise: agent.api.user.guides({ id: guide_id }).get(),
         action: 'get guide',
         resourceHint: `guide ${guide_id}`,
       }),
diff --git a/packages/mcp/src/tools/knowledge.ts b/packages/mcp/src/tools/knowledge.ts
index 261a915dbe..d1ee3087cd 100644
--- a/packages/mcp/src/tools/knowledge.ts
+++ b/packages/mcp/src/tools/knowledge.ts
@@ -16,7 +16,8 @@ export function registerKnowledgeTools(agent: AgentContext): void {
       },
     },
     async ({ query, limit }) =>
-      call(agent.api.user.ai['rag-search'].get({ query: { q: query, limit } }), {
+      call({
+        promise: agent.api.user.ai['rag-search'].get({ query: { q: query, limit } }),
         action: 'search outdoor guides',
       }),
   );
@@ -31,7 +32,8 @@ export function registerKnowledgeTools(agent: AgentContext): void {
       inputSchema: { url: z.string().url() },
     },
     async ({ url }) =>
-      call(agent.api.user['knowledge-base'].reader.extract.post({ url }), {
+      call({
+        promise: agent.api.user['knowledge-base'].reader.extract.post({ url }),
         action: 'extract URL content',
         resourceHint: url,
       }),
diff --git a/packages/mcp/src/tools/packTemplates.ts b/packages/mcp/src/tools/packTemplates.ts
index 51b5c6f984..2b21dccb49 100644
--- a/packages/mcp/src/tools/packTemplates.ts
+++ b/packages/mcp/src/tools/packTemplates.ts
@@ -12,7 +12,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       description: 'List both user-owned and app-curated pack templates.',
       inputSchema: {},
     },
-    async () => call(agent.api.user['pack-templates'].get(), { action: 'list pack templates' }),
+    async () =>
+      call({ promise: agent.api.user['pack-templates'].get(), action: 'list pack templates' }),
   );
 
   agent.server.registerTool(
@@ -22,7 +23,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       inputSchema: { template_id: z.string() },
     },
     async ({ template_id }) =>
-      call(agent.api.user['pack-templates']({ templateId: template_id }).get(), {
+      call({
+        promise: agent.api.user['pack-templates']({ templateId: template_id }).get(),
         action: 'get pack template',
         resourceHint: `template ${template_id}`,
       }),
@@ -44,8 +46,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
     },
     async ({ name, description, category, image, tags, is_app_template }) => {
       const now = nowIso();
-      return call(
-        agent.api.user['pack-templates'].post({
+      return call({
+        promise: agent.api.user['pack-templates'].post({
           name,
           description,
           category,
@@ -55,8 +57,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
           localCreatedAt: now,
           localUpdatedAt: now,
         }),
-        { action: 'create pack template' },
-      );
+        action: 'create pack template',
+      });
     },
   );
 
@@ -80,7 +82,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       if (category !== undefined) body.category = category;
       if (image !== undefined) body.image = image;
       if (tags !== undefined) body.tags = tags;
-      return call(agent.api.user['pack-templates']({ templateId: template_id }).put(body), {
+      return call({
+        promise: agent.api.user['pack-templates']({ templateId: template_id }).put(body),
         action: 'update pack template',
         resourceHint: `template ${template_id}`,
       });
@@ -94,7 +97,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       inputSchema: { template_id: z.string() },
     },
     async ({ template_id }) =>
-      call(agent.api.user['pack-templates']({ templateId: template_id }).delete(), {
+      call({
+        promise: agent.api.user['pack-templates']({ templateId: template_id }).delete(),
         action: 'delete pack template',
         resourceHint: `template ${template_id}`,
       }),
@@ -109,7 +113,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       inputSchema: { template_id: z.string() },
     },
     async ({ template_id }) =>
-      call(agent.api.user['pack-templates']({ templateId: template_id }).items.get(), {
+      call({
+        promise: agent.api.user['pack-templates']({ templateId: template_id }).items.get(),
         action: 'list pack template items',
         resourceHint: `template ${template_id}`,
       }),
@@ -146,8 +151,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       image,
       notes,
     }) =>
-      call(
-        agent.api.user['pack-templates']({ templateId: template_id }).items.post({
+      call({
+        promise: agent.api.user['pack-templates']({ templateId: template_id }).items.post({
           name,
           description,
           weight,
@@ -159,8 +164,9 @@ export function registerPackTemplateTools(agent: AgentContext): void {
           image,
           notes,
         }),
-        { action: 'add template item', resourceHint: `template ${template_id}` },
-      ),
+        action: 'add template item',
+        resourceHint: `template ${template_id}`,
+      }),
   );
 
   agent.server.registerTool(
@@ -190,7 +196,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
         if (v === undefined) continue;
         body[SNAKE_TO_CAMEL[k] ?? k] = v;
       }
-      return call(agent.api.user['pack-templates'].items({ itemId: item_id }).patch(body), {
+      return call({
+        promise: agent.api.user['pack-templates'].items({ itemId: item_id }).patch(body),
         action: 'update template item',
         resourceHint: `item ${item_id}`,
       });
@@ -204,7 +211,8 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       inputSchema: { item_id: z.string() },
     },
     async ({ item_id }) =>
-      call(agent.api.user['pack-templates'].items({ itemId: item_id }).delete(), {
+      call({
+        promise: agent.api.user['pack-templates'].items({ itemId: item_id }).delete(),
         action: 'delete template item',
         resourceHint: `item ${item_id}`,
       }),
@@ -223,12 +231,12 @@ export function registerPackTemplateTools(agent: AgentContext): void {
       },
     },
     async ({ content_url, is_app_template }) =>
-      call(
-        agent.api.user['pack-templates']['generate-from-online-content'].post({
+      call({
+        promise: agent.api.user['pack-templates']['generate-from-online-content'].post({
           contentUrl: content_url,
           isAppTemplate: is_app_template,
         }),
-        { action: 'generate pack template from URL' },
-      ),
+        action: 'generate pack template from URL',
+      }),
   );
 }
diff --git a/packages/mcp/src/tools/packs.ts b/packages/mcp/src/tools/packs.ts
index 143b7a2d69..5a10c86efc 100644
--- a/packages/mcp/src/tools/packs.ts
+++ b/packages/mcp/src/tools/packs.ts
@@ -19,7 +19,8 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ include_public }) =>
-      call(agent.api.user.packs.get({ query: { includePublic: include_public ? 1 : 0 } }), {
+      call({
+        promise: agent.api.user.packs.get({ query: { includePublic: include_public ? 1 : 0 } }),
         action: 'list packs',
       }),
   );
@@ -36,7 +37,8 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ pack_id }) =>
-      call(agent.api.user.packs({ packId: pack_id }).get(), {
+      call({
+        promise: agent.api.user.packs({ packId: pack_id }).get(),
         action: 'get pack',
         resourceHint: `pack ${pack_id}`,
       }),
@@ -62,8 +64,8 @@ export function registerPackTools(agent: AgentContext): void {
     },
     async ({ name, description, category, is_public, tags }) => {
       const now = nowIso();
-      return call(
-        agent.api.user.packs.post({
+      return call({
+        promise: agent.api.user.packs.post({
           name,
           description,
           category,
@@ -72,8 +74,8 @@ export function registerPackTools(agent: AgentContext): void {
           localCreatedAt: now,
           localUpdatedAt: now,
         }),
-        { action: 'create pack' },
-      );
+        action: 'create pack',
+      });
     },
   );
 
@@ -99,7 +101,8 @@ export function registerPackTools(agent: AgentContext): void {
       if (category !== undefined) body.category = category;
       if (is_public !== undefined) body.isPublic = is_public;
       if (tags !== undefined) body.tags = tags;
-      return call(agent.api.user.packs({ packId: pack_id }).put(body), {
+      return call({
+        promise: agent.api.user.packs({ packId: pack_id }).put(body),
         action: 'update pack',
         resourceHint: `pack ${pack_id}`,
       });
@@ -117,7 +120,8 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ pack_id }) =>
-      call(agent.api.user.packs({ packId: pack_id }).delete(), {
+      call({
+        promise: agent.api.user.packs({ packId: pack_id }).delete(),
         action: 'delete pack',
         resourceHint: `pack ${pack_id}`,
       }),
@@ -132,7 +136,8 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: { pack_id: z.string().describe('The pack ID') },
     },
     async ({ pack_id }) =>
-      call(agent.api.user.packs({ packId: pack_id }).items.get(), {
+      call({
+        promise: agent.api.user.packs({ packId: pack_id }).items.get(),
         action: 'list pack items',
         resourceHint: `pack ${pack_id}`,
       }),
@@ -147,7 +152,8 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: { item_id: z.string().describe('The pack item ID') },
     },
     async ({ item_id }) =>
-      call(agent.api.user.packs.items({ itemId: item_id }).get(), {
+      call({
+        promise: agent.api.user.packs.items({ itemId: item_id }).get(),
         action: 'get pack item',
         resourceHint: `item ${item_id}`,
       }),
@@ -190,8 +196,8 @@ export function registerPackTools(agent: AgentContext): void {
       is_worn,
       notes,
     }) =>
-      call(
-        agent.api.user.packs({ packId: pack_id }).items.post({
+      call({
+        promise: agent.api.user.packs({ packId: pack_id }).items.post({
           name,
           category,
           weight: weight_grams,
@@ -201,8 +207,9 @@ export function registerPackTools(agent: AgentContext): void {
           worn: is_worn,
           notes,
         }),
-        { action: 'add pack item', resourceHint: `pack ${pack_id}` },
-      ),
+        action: 'add pack item',
+        resourceHint: `pack ${pack_id}`,
+      }),
   );
 
   // ── Update pack item ──────────────────────────────────────────────────────
@@ -231,7 +238,8 @@ export function registerPackTools(agent: AgentContext): void {
       if (is_consumable !== undefined) body.consumable = is_consumable;
       if (is_worn !== undefined) body.worn = is_worn;
       if (notes !== undefined) body.notes = notes;
-      return call(agent.api.user.packs.items({ itemId: item_id }).patch(body), {
+      return call({
+        promise: agent.api.user.packs.items({ itemId: item_id }).patch(body),
         action: 'update pack item',
         resourceHint: `item ${item_id}`,
       });
@@ -247,7 +255,8 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: { item_id: z.string().describe('The item ID to remove') },
     },
     async ({ item_id }) =>
-      call(agent.api.user.packs.items({ itemId: item_id }).delete(), {
+      call({
+        promise: agent.api.user.packs.items({ itemId: item_id }).delete(),
         action: 'delete pack item',
         resourceHint: `item ${item_id}`,
       }),
@@ -267,13 +276,14 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ pack_id, item_id, limit, threshold }) =>
-      call(
-        agent.api.user
+      call({
+        promise: agent.api.user
           .packs({ packId: pack_id })
           .items({ itemId: item_id })
           .similar.get({ query: { limit, ...(threshold !== undefined ? { threshold } : {}) } }),
-        { action: 'find similar items', resourceHint: `item ${item_id}` },
-      ),
+        action: 'find similar items',
+        resourceHint: `item ${item_id}`,
+      }),
   );
 
   // ── Pack item suggestions ─────────────────────────────────────────────────
@@ -289,12 +299,13 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ pack_id, existing_catalog_item_ids }) =>
-      call(
-        agent.api.user
+      call({
+        promise: agent.api.user
           .packs({ packId: pack_id })
           ['item-suggestions'].post({ existingCatalogItemIds: existing_catalog_item_ids }),
-        { action: 'suggest pack items', resourceHint: `pack ${pack_id}` },
-      ),
+        action: 'suggest pack items',
+        resourceHint: `pack ${pack_id}`,
+      }),
   );
 
   // ── Weight history ────────────────────────────────────────────────────────
@@ -306,7 +317,8 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: {},
     },
     async () =>
-      call(agent.api.user.packs['weight-history'].get(), {
+      call({
+        promise: agent.api.user.packs['weight-history'].get(),
         action: 'list pack weight history',
       }),
   );
@@ -318,12 +330,13 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: { pack_id: z.string(), weight_grams: z.number().min(0) },
     },
     async ({ pack_id, weight_grams }) =>
-      call(
-        agent.api.user
+      call({
+        promise: agent.api.user
           .packs({ packId: pack_id })
           ['weight-history'].post({ weight: weight_grams, localCreatedAt: nowIso() }),
-        { action: 'record pack weight', resourceHint: `pack ${pack_id}` },
-      ),
+        action: 'record pack weight',
+        resourceHint: `pack ${pack_id}`,
+      }),
   );
 
   // ── Pack weight analysis (server-computed breakdown) ─────────────────────
@@ -335,7 +348,8 @@ export function registerPackTools(agent: AgentContext): void {
       inputSchema: { pack_id: z.string().describe('The pack ID to analyze') },
     },
     async ({ pack_id }) =>
-      call(agent.api.user.packs({ packId: pack_id })['weight-breakdown'].get(), {
+      call({
+        promise: agent.api.user.packs({ packId: pack_id })['weight-breakdown'].get(),
         action: 'analyze pack weight',
         resourceHint: `pack ${pack_id}`,
       }),
@@ -358,16 +372,17 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ pack_id, destination, trip_type, duration_days, start_date, end_date }) =>
-      call(
-        agent.api.user.packs({ packId: pack_id })['gap-analysis'].post({
+      call({
+        promise: agent.api.user.packs({ packId: pack_id })['gap-analysis'].post({
           destination,
           tripType: trip_type,
           duration: duration_days,
           startDate: start_date,
           endDate: end_date,
         }),
-        { action: 'analyze pack gaps', resourceHint: `pack ${pack_id}` },
-      ),
+        action: 'analyze pack gaps',
+        resourceHint: `pack ${pack_id}`,
+      }),
   );
 
   // ── Image-based gear detection ───────────────────────────────────────────
@@ -389,9 +404,12 @@ export function registerPackTools(agent: AgentContext): void {
       },
     },
     async ({ image_key, match_limit }) =>
-      call(
-        agent.api.user.packs['analyze-image'].post({ image: image_key, matchLimit: match_limit }),
-        { action: 'analyze pack image' },
-      ),
+      call({
+        promise: agent.api.user.packs['analyze-image'].post({
+          image: image_key,
+          matchLimit: match_limit,
+        }),
+        action: 'analyze pack image',
+      }),
   );
 }
diff --git a/packages/mcp/src/tools/seasons.ts b/packages/mcp/src/tools/seasons.ts
index 87b2a2b61e..73edebde5f 100644
--- a/packages/mcp/src/tools/seasons.ts
+++ b/packages/mcp/src/tools/seasons.ts
@@ -16,7 +16,8 @@ export function registerSeasonTools(agent: AgentContext): void {
       },
     },
     async ({ location, date }) =>
-      call(agent.api.user['season-suggestions'].post({ location, date }), {
+      call({
+        promise: agent.api.user['season-suggestions'].post({ location, date }),
         action: 'fetch season suggestions',
       }),
   );
diff --git a/packages/mcp/src/tools/trail-conditions.ts b/packages/mcp/src/tools/trail-conditions.ts
index 380abe5cdb..73ccd37cf9 100644
--- a/packages/mcp/src/tools/trail-conditions.ts
+++ b/packages/mcp/src/tools/trail-conditions.ts
@@ -17,12 +17,12 @@ export function registerTrailConditionTools(agent: AgentContext): void {
       },
     },
     async ({ trail_name, limit }) =>
-      call(
-        agent.api.user['trail-conditions'].get({
+      call({
+        promise: agent.api.user['trail-conditions'].get({
           query: { trailName: trail_name, limit },
         }),
-        { action: 'list trail conditions' },
-      ),
+        action: 'list trail conditions',
+      }),
   );
 
   // ── List user's own trail reports ─────────────────────────────────────────
@@ -39,12 +39,12 @@ export function registerTrailConditionTools(agent: AgentContext): void {
       },
     },
     async ({ updated_since }) =>
-      call(
-        agent.api.user['trail-conditions'].mine.get({
+      call({
+        promise: agent.api.user['trail-conditions'].mine.get({
           query: updated_since ? { updatedAt: updated_since } : {},
         }),
-        { action: 'list my trail reports' },
-      ),
+        action: 'list my trail reports',
+      }),
   );
 
   // ── Submit trail condition ────────────────────────────────────────────────
@@ -80,8 +80,8 @@ export function registerTrailConditionTools(agent: AgentContext): void {
       trip_id,
     }) => {
       const now = nowIso();
-      return call(
-        agent.api.user['trail-conditions'].post({
+      return call({
+        promise: agent.api.user['trail-conditions'].post({
           trailName: trail_name,
           trailRegion: trail_region ?? null,
           surface,
@@ -95,8 +95,8 @@ export function registerTrailConditionTools(agent: AgentContext): void {
           localCreatedAt: now,
           localUpdatedAt: now,
         }),
-        { action: 'submit trail condition report' },
-      );
+        action: 'submit trail condition report',
+      });
     },
   );
 
@@ -143,7 +143,8 @@ export function registerTrailConditionTools(agent: AgentContext): void {
       }
       if (notes !== undefined) body.notes = notes;
       if (photos !== undefined) body.photos = photos;
-      return call(agent.api.user['trail-conditions']({ reportId: report_id }).put(body), {
+      return call({
+        promise: agent.api.user['trail-conditions']({ reportId: report_id }).put(body),
         action: 'update trail report',
         resourceHint: `report ${report_id}`,
       });
@@ -159,7 +160,8 @@ export function registerTrailConditionTools(agent: AgentContext): void {
       inputSchema: { report_id: z.string() },
     },
     async ({ report_id }) =>
-      call(agent.api.user['trail-conditions']({ reportId: report_id }).delete(), {
+      call({
+        promise: agent.api.user['trail-conditions']({ reportId: report_id }).delete(),
         action: 'delete trail report',
         resourceHint: `report ${report_id}`,
       }),
diff --git a/packages/mcp/src/tools/trails.ts b/packages/mcp/src/tools/trails.ts
index 3831104006..759a937644 100644
--- a/packages/mcp/src/tools/trails.ts
+++ b/packages/mcp/src/tools/trails.ts
@@ -21,12 +21,12 @@ export function registerTrailTools(agent: AgentContext): void {
       },
     },
     async ({ q, lat, lon, radius, sport, limit, offset }) =>
-      call(
-        agent.api.user.trails.search.get({ query: { q, lat, lon, radius, sport, limit, offset } }),
-        {
-          action: 'search trails',
-        },
-      ),
+      call({
+        promise: agent.api.user.trails.search.get({
+          query: { q, lat, lon, radius, sport, limit, offset },
+        }),
+        action: 'search trails',
+      }),
   );
 
   // ── Get trail metadata ────────────────────────────────────────────────────
@@ -39,7 +39,8 @@ export function registerTrailTools(agent: AgentContext): void {
       inputSchema: { osm_id: z.string() },
     },
     async ({ osm_id }) =>
-      call(agent.api.user.trails({ osmId: osm_id }).get(), {
+      call({
+        promise: agent.api.user.trails({ osmId: osm_id }).get(),
         action: 'get trail',
         resourceHint: `trail ${osm_id}`,
       }),
@@ -55,7 +56,8 @@ export function registerTrailTools(agent: AgentContext): void {
       inputSchema: { osm_id: z.string() },
     },
     async ({ osm_id }) =>
-      call(agent.api.user.trails({ osmId: osm_id }).geometry.get(), {
+      call({
+        promise: agent.api.user.trails({ osmId: osm_id }).geometry.get(),
         action: 'get trail geometry',
         resourceHint: `trail ${osm_id}`,
       }),
diff --git a/packages/mcp/src/tools/trips.ts b/packages/mcp/src/tools/trips.ts
index 3f78c9e2f9..f218051380 100644
--- a/packages/mcp/src/tools/trips.ts
+++ b/packages/mcp/src/tools/trips.ts
@@ -18,7 +18,7 @@ export function registerTripTools(agent: AgentContext): void {
         "List all of the user's planned trips. Returns trip summaries including name, destination, dates, and linked pack.",
       inputSchema: {},
     },
-    async () => call(agent.api.user.trips.get(), { action: 'list trips' }),
+    async () => call({ promise: agent.api.user.trips.get(), action: 'list trips' }),
   );
 
   // ── Get trip ──────────────────────────────────────────────────────────────
@@ -31,7 +31,8 @@ export function registerTripTools(agent: AgentContext): void {
       inputSchema: { trip_id: z.string().describe('The unique trip ID (e.g. "t_abc123")') },
     },
     async ({ trip_id }) =>
-      call(agent.api.user.trips({ tripId: trip_id }).get(), {
+      call({
+        promise: agent.api.user.trips({ tripId: trip_id }).get(),
         action: 'get trip',
         resourceHint: `trip ${trip_id}`,
       }),
@@ -56,8 +57,8 @@ export function registerTripTools(agent: AgentContext): void {
     },
     async ({ name, description, location, start_date, end_date, notes, pack_id }) => {
       const now = nowIso();
-      return call(
-        agent.api.user.trips.post({
+      return call({
+        promise: agent.api.user.trips.post({
           name,
           description,
           location: location ?? null,
@@ -68,8 +69,8 @@ export function registerTripTools(agent: AgentContext): void {
           localCreatedAt: now,
           localUpdatedAt: now,
         }),
-        { action: 'create trip' },
-      );
+        action: 'create trip',
+      });
     },
   );
 
@@ -99,7 +100,8 @@ export function registerTripTools(agent: AgentContext): void {
       if (end_date !== undefined) body.endDate = end_date;
       if (notes !== undefined) body.notes = notes;
       if (pack_id !== undefined) body.packId = pack_id;
-      return call(agent.api.user.trips({ tripId: trip_id }).put(body), {
+      return call({
+        promise: agent.api.user.trips({ tripId: trip_id }).put(body),
         action: 'update trip',
         resourceHint: `trip ${trip_id}`,
       });
@@ -115,7 +117,8 @@ export function registerTripTools(agent: AgentContext): void {
       inputSchema: { trip_id: z.string() },
     },
     async ({ trip_id }) =>
-      call(agent.api.user.trips({ tripId: trip_id }).delete(), {
+      call({
+        promise: agent.api.user.trips({ tripId: trip_id }).delete(),
         action: 'delete trip',
         resourceHint: `trip ${trip_id}`,
       }),
diff --git a/packages/mcp/src/tools/upload.ts b/packages/mcp/src/tools/upload.ts
index cefd094737..0da10f7457 100644
--- a/packages/mcp/src/tools/upload.ts
+++ b/packages/mcp/src/tools/upload.ts
@@ -19,11 +19,11 @@ export function registerUploadTools(agent: AgentContext): void {
       },
     },
     async ({ file_name, content_type, size }) =>
-      call(
-        agent.api.user.upload.presigned.get({
+      call({
+        promise: agent.api.user.upload.presigned.get({
           query: { fileName: file_name, contentType: content_type, size },
         }),
-        { action: 'create presigned upload URL' },
-      ),
+        action: 'create presigned upload URL',
+      }),
   );
 }
diff --git a/packages/mcp/src/tools/user.ts b/packages/mcp/src/tools/user.ts
index 68ed99e29f..3dfaef94ed 100644
--- a/packages/mcp/src/tools/user.ts
+++ b/packages/mcp/src/tools/user.ts
@@ -11,7 +11,7 @@ export function registerUserTools(agent: AgentContext): void {
       description: "Get the authenticated user's profile (firstName, lastName, email, avatar).",
       inputSchema: {},
     },
-    async () => call(agent.api.user.user.profile.get(), { action: 'get profile' }),
+    async () => call({ promise: agent.api.user.user.profile.get(), action: 'get profile' }),
   );
 
   agent.server.registerTool(
@@ -31,7 +31,7 @@ export function registerUserTools(agent: AgentContext): void {
       if (last_name !== undefined) body.lastName = last_name;
       if (email !== undefined) body.email = email;
       if (avatar_url !== undefined) body.avatarUrl = avatar_url;
-      return call(agent.api.user.user.profile.put(body), { action: 'update profile' });
+      return call({ promise: agent.api.user.user.profile.put(body), action: 'update profile' });
     },
   );
 }
diff --git a/packages/mcp/src/tools/weather.ts b/packages/mcp/src/tools/weather.ts
index e8890dbc2b..ff41923750 100644
--- a/packages/mcp/src/tools/weather.ts
+++ b/packages/mcp/src/tools/weather.ts
@@ -17,7 +17,8 @@ export function registerWeatherTools(agent: AgentContext): void {
       },
     },
     async ({ location }) =>
-      call(agent.api.user.weather['by-name'].get({ query: { q: location } }), {
+      call({
+        promise: agent.api.user.weather['by-name'].get({ query: { q: location } }),
         action: 'fetch weather forecast',
         resourceHint: location,
       }),
@@ -32,7 +33,8 @@ export function registerWeatherTools(agent: AgentContext): void {
       inputSchema: { query: z.string().min(2) },
     },
     async ({ query }) =>
-      call(agent.api.user.weather.search.get({ query: { q: query } }), {
+      call({
+        promise: agent.api.user.weather.search.get({ query: { q: query } }),
         action: 'search weather location',
         resourceHint: query,
       }),
@@ -50,12 +52,12 @@ export function registerWeatherTools(agent: AgentContext): void {
       },
     },
     async ({ latitude, longitude }) =>
-      call(
-        agent.api.user.weather['search-by-coordinates'].get({
+      call({
+        promise: agent.api.user.weather['search-by-coordinates'].get({
           query: { lat: latitude, lon: longitude },
         }),
-        { action: 'search weather by coordinates' },
-      ),
+        action: 'search weather by coordinates',
+      }),
   );
 
   // ── Forecast by location id ───────────────────────────────────────────────
@@ -68,7 +70,8 @@ export function registerWeatherTools(agent: AgentContext): void {
       inputSchema: { location_id: z.union([z.string(), z.number()]) },
     },
     async ({ location_id }) =>
-      call(agent.api.user.weather.forecast.get({ query: { id: String(location_id) } }), {
+      call({
+        promise: agent.api.user.weather.forecast.get({ query: { id: String(location_id) } }),
         action: 'get weather forecast',
         resourceHint: `location ${location_id}`,
       }),
diff --git a/packages/mcp/src/tools/wildlife.ts b/packages/mcp/src/tools/wildlife.ts
index 470f8d40f9..f4e9cd0b7d 100644
--- a/packages/mcp/src/tools/wildlife.ts
+++ b/packages/mcp/src/tools/wildlife.ts
@@ -11,7 +11,8 @@ export function registerWildlifeTools(agent: AgentContext): void {
       inputSchema: { image_key: z.string() },
     },
     async ({ image_key }) =>
-      call(agent.api.user.wildlife.identify.post({ image: image_key }), {
+      call({
+        promise: agent.api.user.wildlife.identify.post({ image: image_key }),
         action: 'identify wildlife',
       }),
   );
diff --git a/packages/mcp/src/types.ts b/packages/mcp/src/types.ts
index efb91bb0ed..4aa6db1e50 100644
--- a/packages/mcp/src/types.ts
+++ b/packages/mcp/src/types.ts
@@ -24,10 +24,10 @@ export type RegisterFlaggedToolFn = <
   // The TS types here mirror McpServer['registerTool']; we accept any args after
   // the flag name and rely on the SDK to validate downstream.
   TArgs extends Parameters<RegisterToolFn>,
->(
-  flag: string,
-  ...args: TArgs
-) => ReturnType<RegisterToolFn>;
+>(args: {
+  flag: string;
+  args: TArgs;
+}) => ReturnType<RegisterToolFn>;
 
 export interface AgentContext {
   server: McpServer;
@@ -38,7 +38,7 @@ export interface AgentContext {
   /** Replace the per-session admin token (set by `admin_login`). */
   setAdminToken: (token: string) => void;
   /** Toggle a feature flag at runtime (debug / admin-set). */
-  setFeatureFlag: (flag: string, enabled: boolean) => void;
+  setFeatureFlag: (args: { flag: string; enabled: boolean }) => void;
   /**
    * Register a tool that's only visible when the session holds an admin JWT.
    * Has the same signature as `server.registerTool`. The MCP SDK's
diff --git a/packages/overpass/src/builder.test.ts b/packages/overpass/src/builder.test.ts
index cb6522804a..c2f51b15fa 100644
--- a/packages/overpass/src/builder.test.ts
+++ b/packages/overpass/src/builder.test.ts
@@ -14,7 +14,11 @@ describe('TrailQueryBuilder', () => {
     });
 
     it('ignores sport/name/spatial filters when id is set', () => {
-      const ql = new TrailQueryBuilder().sport('hiking').around(37.7, -122.4, 50000).id(42).build();
+      const ql = new TrailQueryBuilder()
+        .sport('hiking')
+        .around({ lat: 37.7, lon: -122.4, radiusM: 50000 })
+        .id(42)
+        .build();
       expect(ql).toBe('[out:json][timeout:25];\nrelation(42);\nout geom;');
     });
   });
@@ -60,19 +64,23 @@ describe('TrailQueryBuilder', () => {
 
   describe('around()', () => {
     it('adds around spatial filter', () => {
-      const ql = new TrailQueryBuilder().around(37.7749, -122.4194, 50000).build();
+      const ql = new TrailQueryBuilder()
+        .around({ lat: 37.7749, lon: -122.4194, radiusM: 50000 })
+        .build();
       expect(ql).toContain('(around:50000,37.7749,-122.4194)');
     });
 
     it('rounds radius to nearest integer', () => {
-      const ql = new TrailQueryBuilder().around(0, 0, 12345.6).build();
+      const ql = new TrailQueryBuilder().around({ lat: 0, lon: 0, radiusM: 12345.6 }).build();
       expect(ql).toContain('(around:12346,0,0)');
     });
   });
 
   describe('bbox()', () => {
     it('adds bbox spatial filter', () => {
-      const ql = new TrailQueryBuilder().bbox(37.5, -122.5, 37.9, -122.1).build();
+      const ql = new TrailQueryBuilder()
+        .bbox({ south: 37.5, west: -122.5, north: 37.9, east: -122.1 })
+        .build();
       expect(ql).toContain('(37.5,-122.5,37.9,-122.1)');
     });
   });
@@ -104,7 +112,7 @@ describe('TrailQueryBuilder', () => {
       const ql = new TrailQueryBuilder()
         .sport('hiking')
         .name('JMT')
-        .around(36.5, -118.5, 100000)
+        .around({ lat: 36.5, lon: -118.5, radiusM: 100000 })
         .build();
       expect(ql).toContain(
         'relation["type"="route"]["route"="hiking"]["name"~"JMT",i](around:100000,36.5,-118.5)',
diff --git a/packages/overpass/src/builder.ts b/packages/overpass/src/builder.ts
index 45a2892569..285d20d411 100644
--- a/packages/overpass/src/builder.ts
+++ b/packages/overpass/src/builder.ts
@@ -28,14 +28,22 @@ export class TrailQueryBuilder {
     return this;
   }
 
-  // biome-ignore lint/complexity/useMaxParams: geographic coords require 3 args
-  around(lat: number, lon: number, radiusM: number): this {
+  around({ lat, lon, radiusM }: { lat: number; lon: number; radiusM: number }): this {
     this._spatial = `(around:${Math.round(radiusM)},${lat},${lon})`;
     return this;
   }
 
-  // biome-ignore lint/complexity/useMaxParams: bbox requires 4 coordinate args
-  bbox(south: number, west: number, north: number, east: number): this {
+  bbox({
+    south,
+    west,
+    north,
+    east,
+  }: {
+    south: number;
+    west: number;
+    north: number;
+    east: number;
+  }): this {
     this._spatial = `(${south},${west},${north},${east})`;
     return this;
   }
diff --git a/packages/overpass/src/client.ts b/packages/overpass/src/client.ts
index 4278060e26..b45e5b986d 100644
--- a/packages/overpass/src/client.ts
+++ b/packages/overpass/src/client.ts
@@ -8,10 +8,13 @@ export interface OverpassClientConfig {
   endpoint?: string;
 }
 
-export async function queryOverpass(
-  ql: string,
-  config?: OverpassClientConfig,
-): Promise<OverpassResponse> {
+export async function queryOverpass({
+  ql,
+  config,
+}: {
+  ql: string;
+  config?: OverpassClientConfig;
+}): Promise<OverpassResponse> {
   const endpoint = config?.endpoint ?? DEFAULT_ENDPOINT;
 
   const response = await fetch(endpoint, {
diff --git a/packages/units/src/index.test.ts b/packages/units/src/index.test.ts
index e2c0fcd247..656fb4411c 100644
--- a/packages/units/src/index.test.ts
+++ b/packages/units/src/index.test.ts
@@ -52,49 +52,49 @@ describe('WEIGHT_UNITS', () => {
 
 describe('normalize (→ grams)', () => {
   it('g is a no-op', () => {
-    expect(normalize(100, 'g')).toBe(100);
-    expect(normalize(0, 'g')).toBe(0);
-    expect(normalize(1, 'g')).toBe(1);
-    expect(normalize(0.001, 'g')).toBe(0.001);
+    expect(normalize({ weight: 100, unit: 'g' })).toBe(100);
+    expect(normalize({ weight: 0, unit: 'g' })).toBe(0);
+    expect(normalize({ weight: 1, unit: 'g' })).toBe(1);
+    expect(normalize({ weight: 0.001, unit: 'g' })).toBe(0.001);
   });
 
   it('kg → g: 1 kg = 1000 g exactly', () => {
-    expect(normalize(1, 'kg')).toBe(KG_TO_G);
-    expect(normalize(2.5, 'kg')).toBe(2500);
-    expect(normalize(0.5, 'kg')).toBe(500);
-    expect(normalize(0.001, 'kg')).toBeCloseTo(1, 10);
-    expect(normalize(10, 'kg')).toBe(10_000);
-    expect(normalize(100, 'kg')).toBe(100_000);
+    expect(normalize({ weight: 1, unit: 'kg' })).toBe(KG_TO_G);
+    expect(normalize({ weight: 2.5, unit: 'kg' })).toBe(2500);
+    expect(normalize({ weight: 0.5, unit: 'kg' })).toBe(500);
+    expect(normalize({ weight: 0.001, unit: 'kg' })).toBeCloseTo(1, 10);
+    expect(normalize({ weight: 10, unit: 'kg' })).toBe(10_000);
+    expect(normalize({ weight: 100, unit: 'kg' })).toBe(100_000);
   });
 
   it('oz → g: 1 oz = 28.349523125 g (NIST exact)', () => {
-    expect(normalize(1, 'oz')).toBe(OZ_TO_G);
-    expect(normalize(2, 'oz')).toBeCloseTo(OZ_TO_G * 2, 8);
-    expect(normalize(0.5, 'oz')).toBeCloseTo(OZ_TO_G * 0.5, 8);
-    expect(normalize(16, 'oz')).toBeCloseTo(LB_TO_G, 8); // 1 lb worth of oz
-    expect(normalize(8, 'oz')).toBeCloseTo(LB_TO_G / 2, 8);
-    expect(normalize(32, 'oz')).toBeCloseTo(LB_TO_G * 2, 8);
+    expect(normalize({ weight: 1, unit: 'oz' })).toBe(OZ_TO_G);
+    expect(normalize({ weight: 2, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 2, 8);
+    expect(normalize({ weight: 0.5, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.5, 8);
+    expect(normalize({ weight: 16, unit: 'oz' })).toBeCloseTo(LB_TO_G, 8); // 1 lb worth of oz
+    expect(normalize({ weight: 8, unit: 'oz' })).toBeCloseTo(LB_TO_G / 2, 8);
+    expect(normalize({ weight: 32, unit: 'oz' })).toBeCloseTo(LB_TO_G * 2, 8);
   });
 
   it('lb → g: 1 lb = 453.59237 g (NIST exact)', () => {
-    expect(normalize(1, 'lb')).toBe(LB_TO_G);
-    expect(normalize(2, 'lb')).toBe(LB_TO_G * 2);
-    expect(normalize(0.5, 'lb')).toBeCloseTo(LB_TO_G * 0.5, 8);
-    expect(normalize(3, 'lb')).toBeCloseTo(LB_TO_G * 3, 8);
-    expect(normalize(10, 'lb')).toBeCloseTo(LB_TO_G * 10, 5);
+    expect(normalize({ weight: 1, unit: 'lb' })).toBe(LB_TO_G);
+    expect(normalize({ weight: 2, unit: 'lb' })).toBe(LB_TO_G * 2);
+    expect(normalize({ weight: 0.5, unit: 'lb' })).toBeCloseTo(LB_TO_G * 0.5, 8);
+    expect(normalize({ weight: 3, unit: 'lb' })).toBeCloseTo(LB_TO_G * 3, 8);
+    expect(normalize({ weight: 10, unit: 'lb' })).toBeCloseTo(LB_TO_G * 10, 5);
   });
 
   it('handles fractional ultralight gear weights', () => {
-    expect(normalize(0.1, 'oz')).toBeCloseTo(OZ_TO_G * 0.1, 8);
-    expect(normalize(0.25, 'oz')).toBeCloseTo(OZ_TO_G * 0.25, 8);
-    expect(normalize(0.3, 'oz')).toBeCloseTo(OZ_TO_G * 0.3, 8);
-    expect(normalize(0.5, 'oz')).toBeCloseTo(OZ_TO_G * 0.5, 8); // ultralight stake
-    expect(normalize(3.2, 'oz')).toBeCloseTo(OZ_TO_G * 3.2, 5); // water filter
+    expect(normalize({ weight: 0.1, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.1, 8);
+    expect(normalize({ weight: 0.25, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.25, 8);
+    expect(normalize({ weight: 0.3, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.3, 8);
+    expect(normalize({ weight: 0.5, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.5, 8); // ultralight stake
+    expect(normalize({ weight: 3.2, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 3.2, 5); // water filter
   });
 
   it('handles typical backpacking item weights', () => {
     // Common gear weights in ounces
-    const oz = (w: number) => normalize(w, 'oz');
+    const oz = (w: number) => normalize({ weight: w, unit: 'oz' });
     expect(oz(1.0)).toBeCloseTo(OZ_TO_G, 5); // headlamp
     expect(oz(4.1)).toBeCloseTo(OZ_TO_G * 4.1, 4); // rain jacket
     expect(oz(8.0)).toBeCloseTo(OZ_TO_G * 8.0, 4); // sleeping pad
@@ -102,14 +102,14 @@ describe('normalize (→ grams)', () => {
     expect(oz(48.0)).toBeCloseTo(OZ_TO_G * 48.0, 4); // 3-lb tent = 48 oz
 
     // Common gear weights in lbs
-    const lb = (w: number) => normalize(w, 'lb');
+    const lb = (w: number) => normalize({ weight: w, unit: 'lb' });
     expect(lb(1.0)).toBeCloseTo(LB_TO_G, 5);
     expect(lb(1.5)).toBeCloseTo(LB_TO_G * 1.5, 4);
     expect(lb(2.5)).toBeCloseTo(LB_TO_G * 2.5, 4);
     expect(lb(4.0)).toBeCloseTo(LB_TO_G * 4.0, 4);
 
     // Common gear weights in kg
-    const kg = (w: number) => normalize(w, 'kg');
+    const kg = (w: number) => normalize({ weight: w, unit: 'kg' });
     expect(kg(0.8)).toBeCloseTo(800, 5);
     expect(kg(1.1)).toBeCloseTo(1100, 5);
     expect(kg(1.5)).toBeCloseTo(1500, 5);
@@ -117,28 +117,28 @@ describe('normalize (→ grams)', () => {
   });
 
   it('handles zero for all units', () => {
-    expect(normalize(0, 'g')).toBe(0);
-    expect(normalize(0, 'oz')).toBe(0);
-    expect(normalize(0, 'lb')).toBe(0);
-    expect(normalize(0, 'kg')).toBe(0);
+    expect(normalize({ weight: 0, unit: 'g' })).toBe(0);
+    expect(normalize({ weight: 0, unit: 'oz' })).toBe(0);
+    expect(normalize({ weight: 0, unit: 'lb' })).toBe(0);
+    expect(normalize({ weight: 0, unit: 'kg' })).toBe(0);
   });
 
   it('handles very small weights', () => {
-    expect(normalize(0.001, 'oz')).toBeCloseTo(OZ_TO_G * 0.001, 10);
-    expect(normalize(0.001, 'lb')).toBeCloseTo(LB_TO_G * 0.001, 10);
-    expect(normalize(0.001, 'kg')).toBeCloseTo(1, 10);
+    expect(normalize({ weight: 0.001, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.001, 10);
+    expect(normalize({ weight: 0.001, unit: 'lb' })).toBeCloseTo(LB_TO_G * 0.001, 10);
+    expect(normalize({ weight: 0.001, unit: 'kg' })).toBeCloseTo(1, 10);
   });
 
   it('handles very large weights', () => {
-    expect(normalize(1000, 'kg')).toBe(1_000_000);
-    expect(normalize(1000, 'lb')).toBeCloseTo(LB_TO_G * 1000, 2);
-    expect(normalize(1000, 'oz')).toBeCloseTo(OZ_TO_G * 1000, 2);
+    expect(normalize({ weight: 1000, unit: 'kg' })).toBe(1_000_000);
+    expect(normalize({ weight: 1000, unit: 'lb' })).toBeCloseTo(LB_TO_G * 1000, 2);
+    expect(normalize({ weight: 1000, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 1000, 2);
   });
 
   it('handles negative weights (sign preserving)', () => {
-    expect(normalize(-1, 'kg')).toBe(-1000);
-    expect(normalize(-1, 'oz')).toBe(-OZ_TO_G);
-    expect(normalize(-1, 'lb')).toBe(-LB_TO_G);
+    expect(normalize({ weight: -1, unit: 'kg' })).toBe(-1000);
+    expect(normalize({ weight: -1, unit: 'oz' })).toBe(-OZ_TO_G);
+    expect(normalize({ weight: -1, unit: 'lb' })).toBe(-LB_TO_G);
   });
 });
 
@@ -148,48 +148,48 @@ describe('normalize (→ grams)', () => {
 
 describe('fromGrams (grams →)', () => {
   it('g is a no-op', () => {
-    expect(fromGrams(100, 'g')).toBe(100);
-    expect(fromGrams(0, 'g')).toBe(0);
-    expect(fromGrams(1, 'g')).toBe(1);
+    expect(fromGrams({ grams: 100, unit: 'g' })).toBe(100);
+    expect(fromGrams({ grams: 0, unit: 'g' })).toBe(0);
+    expect(fromGrams({ grams: 1, unit: 'g' })).toBe(1);
   });
 
   it('g → kg', () => {
-    expect(fromGrams(KG_TO_G, 'kg')).toBe(1);
-    expect(fromGrams(500, 'kg')).toBe(0.5);
-    expect(fromGrams(2500, 'kg')).toBe(2.5);
-    expect(fromGrams(100, 'kg')).toBe(0.1);
-    expect(fromGrams(1, 'kg')).toBe(0.001);
-    expect(fromGrams(1_000_000, 'kg')).toBe(1000);
+    expect(fromGrams({ grams: KG_TO_G, unit: 'kg' })).toBe(1);
+    expect(fromGrams({ grams: 500, unit: 'kg' })).toBe(0.5);
+    expect(fromGrams({ grams: 2500, unit: 'kg' })).toBe(2.5);
+    expect(fromGrams({ grams: 100, unit: 'kg' })).toBe(0.1);
+    expect(fromGrams({ grams: 1, unit: 'kg' })).toBe(0.001);
+    expect(fromGrams({ grams: 1_000_000, unit: 'kg' })).toBe(1000);
   });
 
   it('g → oz: 28.349523125 g = 1 oz (NIST exact)', () => {
-    expect(fromGrams(OZ_TO_G, 'oz')).toBe(1);
-    expect(fromGrams(OZ_TO_G * 2, 'oz')).toBeCloseTo(2, 10);
-    expect(fromGrams(OZ_TO_G * 0.5, 'oz')).toBeCloseTo(0.5, 10);
-    expect(fromGrams(OZ_TO_G * 16, 'oz')).toBeCloseTo(16, 8);
-    expect(fromGrams(0, 'oz')).toBe(0);
-    expect(fromGrams(1_000_000, 'oz')).toBeCloseTo(35273.96, 1);
+    expect(fromGrams({ grams: OZ_TO_G, unit: 'oz' })).toBe(1);
+    expect(fromGrams({ grams: OZ_TO_G * 2, unit: 'oz' })).toBeCloseTo(2, 10);
+    expect(fromGrams({ grams: OZ_TO_G * 0.5, unit: 'oz' })).toBeCloseTo(0.5, 10);
+    expect(fromGrams({ grams: OZ_TO_G * 16, unit: 'oz' })).toBeCloseTo(16, 8);
+    expect(fromGrams({ grams: 0, unit: 'oz' })).toBe(0);
+    expect(fromGrams({ grams: 1_000_000, unit: 'oz' })).toBeCloseTo(35273.96, 1);
   });
 
   it('g → lb: 453.59237 g = 1 lb (NIST exact)', () => {
-    expect(fromGrams(LB_TO_G, 'lb')).toBe(1);
-    expect(fromGrams(LB_TO_G * 2, 'lb')).toBeCloseTo(2, 10);
-    expect(fromGrams(LB_TO_G * 0.5, 'lb')).toBeCloseTo(0.5, 10);
-    expect(fromGrams(1000, 'lb')).toBeCloseTo(1000 / LB_TO_G, 10);
-    expect(fromGrams(0, 'lb')).toBe(0);
-    expect(fromGrams(1_000_000, 'lb')).toBeCloseTo(2204.62, 0);
+    expect(fromGrams({ grams: LB_TO_G, unit: 'lb' })).toBe(1);
+    expect(fromGrams({ grams: LB_TO_G * 2, unit: 'lb' })).toBeCloseTo(2, 10);
+    expect(fromGrams({ grams: LB_TO_G * 0.5, unit: 'lb' })).toBeCloseTo(0.5, 10);
+    expect(fromGrams({ grams: 1000, unit: 'lb' })).toBeCloseTo(1000 / LB_TO_G, 10);
+    expect(fromGrams({ grams: 0, unit: 'lb' })).toBe(0);
+    expect(fromGrams({ grams: 1_000_000, unit: 'lb' })).toBeCloseTo(2204.62, 0);
   });
 
   it('handles very small gram values', () => {
-    expect(fromGrams(1, 'kg')).toBe(0.001);
-    expect(fromGrams(1, 'oz')).toBeCloseTo(1 / OZ_TO_G, 8);
-    expect(fromGrams(1, 'lb')).toBeCloseTo(1 / LB_TO_G, 8);
+    expect(fromGrams({ grams: 1, unit: 'kg' })).toBe(0.001);
+    expect(fromGrams({ grams: 1, unit: 'oz' })).toBeCloseTo(1 / OZ_TO_G, 8);
+    expect(fromGrams({ grams: 1, unit: 'lb' })).toBeCloseTo(1 / LB_TO_G, 8);
   });
 
   it('handles negative grams', () => {
-    expect(fromGrams(-1000, 'kg')).toBe(-1);
-    expect(fromGrams(-OZ_TO_G, 'oz')).toBeCloseTo(-1, 10);
-    expect(fromGrams(-LB_TO_G, 'lb')).toBeCloseTo(-1, 10);
+    expect(fromGrams({ grams: -1000, unit: 'kg' })).toBe(-1);
+    expect(fromGrams({ grams: -OZ_TO_G, unit: 'oz' })).toBeCloseTo(-1, 10);
+    expect(fromGrams({ grams: -LB_TO_G, unit: 'lb' })).toBeCloseTo(-1, 10);
   });
 });
 
@@ -208,8 +208,8 @@ describe('normalize / fromGrams round-trips', () => {
   for (const unit of units) {
     for (const weight of testWeights) {
       it(`${weight} ${unit} → g → ${unit} round-trips exactly`, () => {
-        const grams = normalize(weight, unit);
-        const back = fromGrams(grams, unit);
+        const grams = normalize({ weight: weight, unit: unit });
+        const back = fromGrams({ grams: grams, unit: unit });
         expect(back).toBeCloseTo(weight, 10);
       });
     }
@@ -222,62 +222,83 @@ describe('normalize / fromGrams round-trips', () => {
 
 describe('convert', () => {
   it('same unit returns input unchanged (no float ops)', () => {
-    expect(packratConvert(5, { from: 'g', to: 'g' })).toBe(5);
-    expect(packratConvert(5, { from: 'oz', to: 'oz' })).toBe(5);
-    expect(packratConvert(5, { from: 'lb', to: 'lb' })).toBe(5);
-    expect(packratConvert(5, { from: 'kg', to: 'kg' })).toBe(5);
-    expect(packratConvert(0, { from: 'oz', to: 'oz' })).toBe(0);
+    expect(packratConvert({ weight: 5, units: { from: 'g', to: 'g' } })).toBe(5);
+    expect(packratConvert({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5);
+    expect(packratConvert({ weight: 5, units: { from: 'lb', to: 'lb' } })).toBe(5);
+    expect(packratConvert({ weight: 5, units: { from: 'kg', to: 'kg' } })).toBe(5);
+    expect(packratConvert({ weight: 0, units: { from: 'oz', to: 'oz' } })).toBe(0);
   });
 
   it('oz → lb: 16 oz = 1 lb', () => {
-    expect(packratConvert(16, { from: 'oz', to: 'lb' })).toBeCloseTo(1, 10);
-    expect(packratConvert(8, { from: 'oz', to: 'lb' })).toBeCloseTo(0.5, 10);
-    expect(packratConvert(32, { from: 'oz', to: 'lb' })).toBeCloseTo(2, 10);
+    expect(packratConvert({ weight: 16, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(1, 10);
+    expect(packratConvert({ weight: 8, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(0.5, 10);
+    expect(packratConvert({ weight: 32, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(2, 10);
   });
 
   it('lb → oz: 1 lb = 16 oz', () => {
-    expect(packratConvert(1, { from: 'lb', to: 'oz' })).toBeCloseTo(16, 10);
-    expect(packratConvert(0.5, { from: 'lb', to: 'oz' })).toBeCloseTo(8, 10);
-    expect(packratConvert(2, { from: 'lb', to: 'oz' })).toBeCloseTo(32, 10);
+    expect(packratConvert({ weight: 1, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(16, 10);
+    expect(packratConvert({ weight: 0.5, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(8, 10);
+    expect(packratConvert({ weight: 2, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(32, 10);
   });
 
   it('kg → lb: 1 kg ≈ 2.20462 lb', () => {
-    expect(packratConvert(1, { from: 'kg', to: 'lb' })).toBeCloseTo(2.20462, 4);
-    expect(packratConvert(2, { from: 'kg', to: 'lb' })).toBeCloseTo(4.40924, 4);
-    expect(packratConvert(0.5, { from: 'kg', to: 'lb' })).toBeCloseTo(1.10231, 4);
+    expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(2.20462, 4);
+    expect(packratConvert({ weight: 2, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(4.40924, 4);
+    expect(packratConvert({ weight: 0.5, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(
+      1.10231,
+      4,
+    );
   });
 
   it('lb → kg: 1 lb ≈ 0.453592 kg', () => {
-    expect(packratConvert(1, { from: 'lb', to: 'kg' })).toBeCloseTo(0.453592, 5);
-    expect(packratConvert(2.2046, { from: 'lb', to: 'kg' })).toBeCloseTo(1, 3);
-    expect(packratConvert(10, { from: 'lb', to: 'kg' })).toBeCloseTo(4.53592, 4);
+    expect(packratConvert({ weight: 1, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(0.453592, 5);
+    expect(packratConvert({ weight: 2.2046, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(1, 3);
+    expect(packratConvert({ weight: 10, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(4.53592, 4);
   });
 
   it('g → oz and back', () => {
-    expect(packratConvert(OZ_TO_G, { from: 'g', to: 'oz' })).toBeCloseTo(1, 10);
-    expect(packratConvert(100, { from: 'g', to: 'oz' })).toBeCloseTo(100 / OZ_TO_G, 8);
-    expect(packratConvert(1000, { from: 'g', to: 'oz' })).toBeCloseTo(1000 / OZ_TO_G, 6);
+    expect(packratConvert({ weight: OZ_TO_G, units: { from: 'g', to: 'oz' } })).toBeCloseTo(1, 10);
+    expect(packratConvert({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo(
+      100 / OZ_TO_G,
+      8,
+    );
+    expect(packratConvert({ weight: 1000, units: { from: 'g', to: 'oz' } })).toBeCloseTo(
+      1000 / OZ_TO_G,
+      6,
+    );
   });
 
   it('g → kg and back', () => {
-    expect(packratConvert(1000, { from: 'g', to: 'kg' })).toBe(1);
-    expect(packratConvert(500, { from: 'g', to: 'kg' })).toBe(0.5);
-    expect(packratConvert(1, { from: 'kg', to: 'g' })).toBe(1000);
+    expect(packratConvert({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1);
+    expect(packratConvert({ weight: 500, units: { from: 'g', to: 'kg' } })).toBe(0.5);
+    expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000);
   });
 
   it('g → lb and back', () => {
-    expect(packratConvert(LB_TO_G, { from: 'g', to: 'lb' })).toBeCloseTo(1, 10);
-    expect(packratConvert(100, { from: 'g', to: 'lb' })).toBeCloseTo(100 / LB_TO_G, 8);
+    expect(packratConvert({ weight: LB_TO_G, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 10);
+    expect(packratConvert({ weight: 100, units: { from: 'g', to: 'lb' } })).toBeCloseTo(
+      100 / LB_TO_G,
+      8,
+    );
   });
 
   it('kg → oz', () => {
-    expect(packratConvert(1, { from: 'kg', to: 'oz' })).toBeCloseTo(1000 / OZ_TO_G, 5);
-    expect(packratConvert(0.5, { from: 'kg', to: 'oz' })).toBeCloseTo(500 / OZ_TO_G, 5);
+    expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'oz' } })).toBeCloseTo(
+      1000 / OZ_TO_G,
+      5,
+    );
+    expect(packratConvert({ weight: 0.5, units: { from: 'kg', to: 'oz' } })).toBeCloseTo(
+      500 / OZ_TO_G,
+      5,
+    );
   });
 
   it('oz → kg', () => {
-    expect(packratConvert(1, { from: 'oz', to: 'kg' })).toBeCloseTo(OZ_TO_G / 1000, 8);
-    expect(packratConvert(35.274, { from: 'oz', to: 'kg' })).toBeCloseTo(1, 2);
+    expect(packratConvert({ weight: 1, units: { from: 'oz', to: 'kg' } })).toBeCloseTo(
+      OZ_TO_G / 1000,
+      8,
+    );
+    expect(packratConvert({ weight: 35.274, units: { from: 'oz', to: 'kg' } })).toBeCloseTo(1, 2);
   });
 
   it('all 12 unit pairs are round-trip exact at weight = 42', () => {
@@ -296,16 +317,16 @@ describe('convert', () => {
       ['kg', 'oz'],
     ];
     for (const [a, b] of pairs) {
-      const converted = packratConvert(42, { from: a, to: b });
-      const back = packratConvert(converted, { from: b, to: a });
+      const converted = packratConvert({ weight: 42, units: { from: a, to: b } });
+      const back = packratConvert({ weight: converted, units: { from: b, to: a } });
       expect(back).toBeCloseTo(42, 10);
     }
   });
 
   it('round-trips multiple weights for oz↔lb', () => {
     for (const oz of [0.5, 1, 2, 4, 8, 16, 32, 64]) {
-      const lb = packratConvert(oz, { from: 'oz', to: 'lb' });
-      const back = packratConvert(lb, { from: 'lb', to: 'oz' });
+      const lb = packratConvert({ weight: oz, units: { from: 'oz', to: 'lb' } });
+      const back = packratConvert({ weight: lb, units: { from: 'lb', to: 'oz' } });
       expect(back).toBeCloseTo(oz, 10);
     }
   });
@@ -317,40 +338,40 @@ describe('convert', () => {
 
 describe('displayWeight', () => {
   it('rounds to 2 decimal places by default', () => {
-    expect(displayWeight(normalize(100, 'oz'), 'oz')).toBe(100);
-    expect(displayWeight(normalize(1.5, 'lb'), 'lb')).toBe(1.5);
-    expect(displayWeight(normalize(2.5, 'kg'), 'kg')).toBe(2.5);
+    expect(displayWeight({ grams: normalize({ weight: 100, unit: 'oz' }), unit: 'oz' })).toBe(100);
+    expect(displayWeight({ grams: normalize({ weight: 1.5, unit: 'lb' }), unit: 'lb' })).toBe(1.5);
+    expect(displayWeight({ grams: normalize({ weight: 2.5, unit: 'kg' }), unit: 'kg' })).toBe(2.5);
   });
 
   it('strips trailing zeros', () => {
-    expect(displayWeight(1000, 'kg')).toBe(1); // not 1.00
-    expect(displayWeight(LB_TO_G, 'lb')).toBe(1); // not 1.00
-    expect(displayWeight(500, 'kg')).toBe(0.5); // not 0.50
+    expect(displayWeight({ grams: 1000, unit: 'kg' })).toBe(1); // not 1.00
+    expect(displayWeight({ grams: LB_TO_G, unit: 'lb' })).toBe(1); // not 1.00
+    expect(displayWeight({ grams: 500, unit: 'kg' })).toBe(0.5); // not 0.50
   });
 
   it('handles typical backpacking display values', () => {
     // 3.2 oz water filter
-    const grams = normalize(3.2, 'oz');
-    expect(displayWeight(grams, 'oz')).toBe(3.2);
+    const grams = normalize({ weight: 3.2, unit: 'oz' });
+    expect(displayWeight({ grams: grams, unit: 'oz' })).toBe(3.2);
     // 1.1 kg tent displayed in kg
-    const tentG = normalize(1.1, 'kg');
-    expect(displayWeight(tentG, 'kg')).toBe(1.1);
+    const tentG = normalize({ weight: 1.1, unit: 'kg' });
+    expect(displayWeight({ grams: tentG, unit: 'kg' })).toBe(1.1);
     // tent in lb ≈ 2.43
-    expect(displayWeight(tentG, 'lb')).toBeCloseTo(2.43, 1);
+    expect(displayWeight({ grams: tentG, unit: 'lb' })).toBeCloseTo(2.43, 1);
   });
 
   it('handles ultralight items', () => {
     // 0.5 oz stake → 14.17 g
-    const stakeG = normalize(0.5, 'oz');
-    expect(displayWeight(stakeG, 'oz')).toBe(0.5);
-    expect(displayWeight(stakeG, 'g')).toBeCloseTo(14.17, 1);
+    const stakeG = normalize({ weight: 0.5, unit: 'oz' });
+    expect(displayWeight({ grams: stakeG, unit: 'oz' })).toBe(0.5);
+    expect(displayWeight({ grams: stakeG, unit: 'g' })).toBeCloseTo(14.17, 1);
   });
 
   it('zero weight displays as 0', () => {
-    expect(displayWeight(0, 'oz')).toBe(0);
-    expect(displayWeight(0, 'lb')).toBe(0);
-    expect(displayWeight(0, 'kg')).toBe(0);
-    expect(displayWeight(0, 'g')).toBe(0);
+    expect(displayWeight({ grams: 0, unit: 'oz' })).toBe(0);
+    expect(displayWeight({ grams: 0, unit: 'lb' })).toBe(0);
+    expect(displayWeight({ grams: 0, unit: 'kg' })).toBe(0);
+    expect(displayWeight({ grams: 0, unit: 'g' })).toBe(0);
   });
 
   it('round-trips through normalize: displayWeight(normalize(w, u), u) = w for clean values', () => {
@@ -364,7 +385,7 @@ describe('displayWeight', () => {
       [250, 'g'],
     ];
     for (const [w, u] of cases) {
-      expect(displayWeight(normalize(w, u), u)).toBe(w);
+      expect(displayWeight({ grams: normalize({ weight: w, unit: u }), unit: u })).toBe(w);
     }
   });
 });
@@ -379,105 +400,129 @@ describe('cross-validation against convert-units library', () => {
 
   it('normalize g→g matches convert-units', () => {
     for (const w of [1, 10, 100, 500, 1000]) {
-      expect(normalize(w, 'g')).toBe(w); // trivially same
+      expect(normalize({ weight: w, unit: 'g' })).toBe(w); // trivially same
     }
   });
 
   it('normalize kg→g matches convert-units', () => {
     for (const w of [0.1, 0.5, 1, 1.5, 2, 5, 10]) {
       const expected = convert(w).from('kg').to('g') as number;
-      expect(normalize(w, 'kg')).toBeCloseTo(expected, 2);
+      expect(normalize({ weight: w, unit: 'kg' })).toBeCloseTo(expected, 2);
     }
   });
 
   it('normalize oz→g matches convert-units', () => {
     for (const w of [0.5, 1, 2, 4, 8, 16, 24, 32]) {
       const expected = convert(w).from('oz').to('g') as number;
-      expect(normalize(w, 'oz')).toBeCloseTo(expected, 2);
+      expect(normalize({ weight: w, unit: 'oz' })).toBeCloseTo(expected, 2);
     }
   });
 
   it('normalize lb→g matches convert-units', () => {
     for (const w of [0.5, 1, 1.5, 2, 2.5, 4, 10]) {
       const expected = convert(w).from('lb').to('g') as number;
-      expect(normalize(w, 'lb')).toBeCloseTo(expected, 2);
+      expect(normalize({ weight: w, unit: 'lb' })).toBeCloseTo(expected, 2);
     }
   });
 
   it('fromGrams g→kg matches convert-units', () => {
     for (const g of [100, 500, 1000, 2500, 5000]) {
       const expected = convert(g).from('g').to('kg') as number;
-      expect(fromGrams(g, 'kg')).toBeCloseTo(expected, 5);
+      expect(fromGrams({ grams: g, unit: 'kg' })).toBeCloseTo(expected, 5);
     }
   });
 
   it('fromGrams g→oz matches convert-units', () => {
     for (const g of [28.35, 100, 200, 500, 1000]) {
       const expected = convert(g).from('g').to('oz') as number;
-      expect(fromGrams(g, 'oz')).toBeCloseTo(expected, 2);
+      expect(fromGrams({ grams: g, unit: 'oz' })).toBeCloseTo(expected, 2);
     }
   });
 
   it('fromGrams g→lb matches convert-units', () => {
     for (const g of [100, 227, 453, 907, 1814]) {
       const expected = convert(g).from('g').to('lb') as number;
-      expect(fromGrams(g, 'lb')).toBeCloseTo(expected, 2);
+      expect(fromGrams({ grams: g, unit: 'lb' })).toBeCloseTo(expected, 2);
     }
   });
 
   it('packratConvert oz→lb matches convert-units', () => {
     for (const oz of [1, 4, 8, 12, 16, 32]) {
       const expected = convert(oz).from('oz').to('lb') as number;
-      expect(packratConvert(oz, { from: 'oz', to: 'lb' })).toBeCloseTo(expected, 4);
+      expect(packratConvert({ weight: oz, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(
+        expected,
+        4,
+      );
     }
   });
 
   it('packratConvert lb→oz matches convert-units', () => {
     for (const lb of [0.5, 1, 1.5, 2, 3, 5]) {
       const expected = convert(lb).from('lb').to('oz') as number;
-      expect(packratConvert(lb, { from: 'lb', to: 'oz' })).toBeCloseTo(expected, 4);
+      expect(packratConvert({ weight: lb, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(
+        expected,
+        4,
+      );
     }
   });
 
   it('packratConvert kg→lb matches convert-units', () => {
     for (const kg of [0.5, 1, 1.5, 2, 5, 10]) {
       const expected = convert(kg).from('kg').to('lb') as number;
-      expect(packratConvert(kg, { from: 'kg', to: 'lb' })).toBeCloseTo(expected, 3);
+      expect(packratConvert({ weight: kg, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(
+        expected,
+        3,
+      );
     }
   });
 
   it('packratConvert lb→kg matches convert-units', () => {
     for (const lb of [1, 2.2046, 5, 10, 22.046]) {
       const expected = convert(lb).from('lb').to('kg') as number;
-      expect(packratConvert(lb, { from: 'lb', to: 'kg' })).toBeCloseTo(expected, 3);
+      expect(packratConvert({ weight: lb, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(
+        expected,
+        3,
+      );
     }
   });
 
   it('packratConvert kg→oz matches convert-units', () => {
     for (const kg of [0.5, 1, 2, 5]) {
       const expected = convert(kg).from('kg').to('oz') as number;
-      expect(packratConvert(kg, { from: 'kg', to: 'oz' })).toBeCloseTo(expected, 2);
+      expect(packratConvert({ weight: kg, units: { from: 'kg', to: 'oz' } })).toBeCloseTo(
+        expected,
+        2,
+      );
     }
   });
 
   it('packratConvert oz→kg matches convert-units', () => {
     for (const oz of [1, 8, 16, 35.274]) {
       const expected = convert(oz).from('oz').to('kg') as number;
-      expect(packratConvert(oz, { from: 'oz', to: 'kg' })).toBeCloseTo(expected, 4);
+      expect(packratConvert({ weight: oz, units: { from: 'oz', to: 'kg' } })).toBeCloseTo(
+        expected,
+        4,
+      );
     }
   });
 
   it('packratConvert g→oz matches convert-units', () => {
     for (const g of [28.35, 100, 226.8, 453.6, 1000]) {
       const expected = convert(g).from('g').to('oz') as number;
-      expect(packratConvert(g, { from: 'g', to: 'oz' })).toBeCloseTo(expected, 2);
+      expect(packratConvert({ weight: g, units: { from: 'g', to: 'oz' } })).toBeCloseTo(
+        expected,
+        2,
+      );
     }
   });
 
   it('packratConvert g→lb matches convert-units', () => {
     for (const g of [100, 227, 454, 907, 2268]) {
       const expected = convert(g).from('g').to('lb') as number;
-      expect(packratConvert(g, { from: 'g', to: 'lb' })).toBeCloseTo(expected, 4);
+      expect(packratConvert({ weight: g, units: { from: 'g', to: 'lb' } })).toBeCloseTo(
+        expected,
+        4,
+      );
     }
   });
 });
@@ -499,13 +544,13 @@ describe('pack calculation scenarios', () => {
       { weight: 2, unit: 'oz' as const },
       { weight: 3, unit: 'oz' as const },
     ];
-    const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
-    const totalLb = fromGrams(totalG, 'lb');
+    const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
+    const totalLb = fromGrams({ grams: totalG, unit: 'lb' });
     // Should be roughly 4–6 lbs for a solid ultralight kit
     expect(totalLb).toBeGreaterThan(3.5);
     expect(totalLb).toBeLessThan(7);
     // Cross-validate display
-    expect(displayWeight(totalG, 'lb')).toBeGreaterThan(3.5);
+    expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeGreaterThan(3.5);
   });
 
   it('baseweight vs total weight: consumables excluded from base', () => {
@@ -517,13 +562,13 @@ describe('pack calculation scenarios', () => {
     ];
     const baseG = items
       .filter((i) => !i.consumable)
-      .reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
-    const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
-    const baseKg = fromGrams(baseG, 'kg');
+      .reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
+    const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
+    const baseKg = fromGrams({ grams: baseG, unit: 'kg' });
     // base = 500g + 1.5lb = 500 + 680.38 = 1180.38g ≈ 1.18 kg
     expect(baseKg).toBeCloseTo(1.18, 1);
     // total = base + 4lb of consumables = 1180.38 + 1814.37 ≈ 2994.75g
-    expect(displayWeight(totalG, 'lb')).toBeCloseTo(6.6, 0);
+    expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeCloseTo(6.6, 0);
     expect(baseG).toBeLessThan(totalG);
   });
 
@@ -535,7 +580,7 @@ describe('pack calculation scenarios', () => {
     ];
     const baseG = items
       .filter((i) => !i.worn)
-      .reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
+      .reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
     expect(baseG).toBe(800);
   });
 
@@ -547,19 +592,19 @@ describe('pack calculation scenarios', () => {
       { weight: 1, unit: 'lb' as const }, // 453.6g
       { weight: 100, unit: 'g' as const }, // 100g
     ];
-    const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
+    const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
     // Expected: 1000 + 453.59 + 453.59 + 100 = 2007.18g
     expect(totalG).toBeCloseTo(2007.18, 0);
-    expect(displayWeight(totalG, 'kg')).toBeCloseTo(2.01, 1);
-    expect(displayWeight(totalG, 'lb')).toBeCloseTo(4.42, 1);
+    expect(displayWeight({ grams: totalG, unit: 'kg' })).toBeCloseTo(2.01, 1);
+    expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeCloseTo(4.42, 1);
   });
 
   it('quantity multiplier applies correctly', () => {
     // 8 stakes × 0.5 oz each = 4 oz = ~113.4g
     const stakes = { weight: 0.5, unit: 'oz' as const, quantity: 8 };
-    const totalG = normalize(stakes.weight, stakes.unit) * stakes.quantity;
+    const totalG = normalize({ weight: stakes.weight, unit: stakes.unit }) * stakes.quantity;
     expect(totalG).toBeCloseTo(OZ_TO_G * 4, 5);
-    expect(displayWeight(totalG, 'oz')).toBe(4);
+    expect(displayWeight({ grams: totalG, unit: 'oz' })).toBe(4);
   });
 
   it('category percentage calculation', () => {
@@ -568,8 +613,8 @@ describe('pack calculation scenarios', () => {
       { weight: 300, unit: 'g' as const }, // 300g
       { weight: 200, unit: 'g' as const }, // 200g
     ];
-    const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
-    const pcts = items.map((i) => (normalize(i.weight, i.unit) / totalG) * 100);
+    const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
+    const pcts = items.map((i) => (normalize({ weight: i.weight, unit: i.unit }) / totalG) * 100);
     expect(pcts[0]).toBeCloseTo(50, 5);
     expect(pcts[1]).toBeCloseTo(30, 5);
     expect(pcts[2]).toBeCloseTo(20, 5);
@@ -581,10 +626,10 @@ describe('pack calculation scenarios', () => {
     const item0 = { weight: 1, unit: 'kg' as const };
     const item1 = { weight: 500, unit: 'g' as const };
     const items = [item0, item1];
-    const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
+    const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0);
     // 1000g / 1500g = 66.7%, 500g / 1500g = 33.3%
-    const pct0 = (normalize(item0.weight, item0.unit) / totalG) * 100;
-    const pct1 = (normalize(item1.weight, item1.unit) / totalG) * 100;
+    const pct0 = (normalize({ weight: item0.weight, unit: item0.unit }) / totalG) * 100;
+    const pct1 = (normalize({ weight: item1.weight, unit: item1.unit }) / totalG) * 100;
     expect(pct0).toBeCloseTo(66.67, 1);
     expect(pct1).toBeCloseTo(33.33, 1);
     // Same percentages regardless of whether we display in oz, lb, kg
@@ -603,8 +648,11 @@ describe('pack calculation scenarios', () => {
       { name: 'stove', weight: 3, unit: 'oz' as const },
       { name: 'headlamp', weight: 1.5, unit: 'oz' as const },
     ];
-    const totalG = baseItems.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0);
-    const totalLb = fromGrams(totalG, 'lb');
+    const totalG = baseItems.reduce(
+      (sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }),
+      0,
+    );
+    const totalLb = fromGrams({ grams: totalG, unit: 'lb' });
     // This kit should be in the 10–18 lb base weight range for a typical AT hiker
     expect(totalLb).toBeGreaterThan(8);
     expect(totalLb).toBeLessThan(20);
@@ -621,42 +669,42 @@ describe('numeric edge cases', () => {
   });
 
   it('normalize then fromGrams is identity for exact NIST values', () => {
-    expect(fromGrams(normalize(1, 'oz'), 'oz')).toBe(1);
-    expect(fromGrams(normalize(1, 'lb'), 'lb')).toBe(1);
-    expect(fromGrams(normalize(1, 'kg'), 'kg')).toBe(1);
+    expect(fromGrams({ grams: normalize({ weight: 1, unit: 'oz' }), unit: 'oz' })).toBe(1);
+    expect(fromGrams({ grams: normalize({ weight: 1, unit: 'lb' }), unit: 'lb' })).toBe(1);
+    expect(fromGrams({ grams: normalize({ weight: 1, unit: 'kg' }), unit: 'kg' })).toBe(1);
   });
 
   it('0.1 kg precision (common UI input)', () => {
     // User enters "0.1 kg" — must not drift
-    expect(normalize(0.1, 'kg')).toBe(100);
-    expect(fromGrams(100, 'kg')).toBe(0.1);
+    expect(normalize({ weight: 0.1, unit: 'kg' })).toBe(100);
+    expect(fromGrams({ grams: 100, unit: 'kg' })).toBe(0.1);
   });
 
   it('very precise sub-gram weights', () => {
-    const mg = normalize(0.001, 'g'); // 0.001 g = 1 mg
+    const mg = normalize({ weight: 0.001, unit: 'g' }); // 0.001 g = 1 mg
     expect(mg).toBe(0.001);
-    expect(fromGrams(mg, 'g')).toBe(0.001);
+    expect(fromGrams({ grams: mg, unit: 'g' })).toBe(0.001);
   });
 
   it('large pack weight 50 lb does not overflow', () => {
-    const g = normalize(50, 'lb');
+    const g = normalize({ weight: 50, unit: 'lb' });
     expect(g).toBeCloseTo(LB_TO_G * 50, 2);
-    expect(fromGrams(g, 'lb')).toBeCloseTo(50, 8);
+    expect(fromGrams({ grams: g, unit: 'lb' })).toBeCloseTo(50, 8);
   });
 
   it('convert same-unit short-circuits (no floating point ops)', () => {
     // IEEE 754 exact: if from===to we return the input directly
     const w = 1 / 3; // irrational in float
-    expect(packratConvert(w, { from: 'oz', to: 'oz' })).toBe(w); // toBe = same reference value
-    expect(packratConvert(w, { from: 'lb', to: 'lb' })).toBe(w);
-    expect(packratConvert(w, { from: 'kg', to: 'kg' })).toBe(w);
-    expect(packratConvert(w, { from: 'g', to: 'g' })).toBe(w);
+    expect(packratConvert({ weight: w, units: { from: 'oz', to: 'oz' } })).toBe(w); // toBe = same reference value
+    expect(packratConvert({ weight: w, units: { from: 'lb', to: 'lb' } })).toBe(w);
+    expect(packratConvert({ weight: w, units: { from: 'kg', to: 'kg' } })).toBe(w);
+    expect(packratConvert({ weight: w, units: { from: 'g', to: 'g' } })).toBe(w);
   });
 
   it('16 oz equals 1 lb through convert', () => {
     // 16 oz → lb must equal exactly 1 lb → oz → lb
-    const via_oz = packratConvert(16, { from: 'oz', to: 'lb' });
-    const direct = packratConvert(1, { from: 'lb', to: 'lb' });
+    const via_oz = packratConvert({ weight: 16, units: { from: 'oz', to: 'lb' } });
+    const direct = packratConvert({ weight: 1, units: { from: 'lb', to: 'lb' } });
     expect(via_oz).toBeCloseTo(direct, 10);
   });
 });
@@ -735,39 +783,39 @@ describe('isWeightUnit', () => {
 
 describe('parseWeightUnit', () => {
   it('returns the unit unchanged for all four valid units', () => {
-    expect(parseWeightUnit('g')).toBe('g');
-    expect(parseWeightUnit('kg')).toBe('kg');
-    expect(parseWeightUnit('oz')).toBe('oz');
-    expect(parseWeightUnit('lb')).toBe('lb');
+    expect(parseWeightUnit({ value: 'g' })).toBe('g');
+    expect(parseWeightUnit({ value: 'kg' })).toBe('kg');
+    expect(parseWeightUnit({ value: 'oz' })).toBe('oz');
+    expect(parseWeightUnit({ value: 'lb' })).toBe('lb');
   });
 
   it('falls back to g by default for invalid input', () => {
-    expect(parseWeightUnit('lbs')).toBe('g');
-    expect(parseWeightUnit('KG')).toBe('g');
-    expect(parseWeightUnit('stone')).toBe('g');
-    expect(parseWeightUnit(null)).toBe('g');
-    expect(parseWeightUnit(undefined)).toBe('g');
-    expect(parseWeightUnit('')).toBe('g');
-    expect(parseWeightUnit(42)).toBe('g');
-    expect(parseWeightUnit({})).toBe('g');
+    expect(parseWeightUnit({ value: 'lbs' })).toBe('g');
+    expect(parseWeightUnit({ value: 'KG' })).toBe('g');
+    expect(parseWeightUnit({ value: 'stone' })).toBe('g');
+    expect(parseWeightUnit({ value: null })).toBe('g');
+    expect(parseWeightUnit({ value: undefined })).toBe('g');
+    expect(parseWeightUnit({ value: '' })).toBe('g');
+    expect(parseWeightUnit({ value: 42 })).toBe('g');
+    expect(parseWeightUnit({ value: {} })).toBe('g');
   });
 
   it('uses the provided fallback for all four valid fallback units', () => {
-    expect(parseWeightUnit('invalid', 'oz')).toBe('oz');
-    expect(parseWeightUnit('invalid', 'lb')).toBe('lb');
-    expect(parseWeightUnit('invalid', 'kg')).toBe('kg');
-    expect(parseWeightUnit('invalid', 'g')).toBe('g');
+    expect(parseWeightUnit({ value: 'invalid', fallback: 'oz' })).toBe('oz');
+    expect(parseWeightUnit({ value: 'invalid', fallback: 'lb' })).toBe('lb');
+    expect(parseWeightUnit({ value: 'invalid', fallback: 'kg' })).toBe('kg');
+    expect(parseWeightUnit({ value: 'invalid', fallback: 'g' })).toBe('g');
   });
 
   it('does not apply fallback when input is valid', () => {
-    expect(parseWeightUnit('oz', 'lb')).toBe('oz'); // valid → ignore fallback
-    expect(parseWeightUnit('kg', 'oz')).toBe('kg');
+    expect(parseWeightUnit({ value: 'oz', fallback: 'lb' })).toBe('oz'); // valid → ignore fallback
+    expect(parseWeightUnit({ value: 'kg', fallback: 'oz' })).toBe('kg');
   });
 
   it('handles real-world API inputs that may come as null/undefined', () => {
     // Simulating JSON parse of user preferences not yet set
     const prefs: Record<string, unknown> = {};
-    expect(parseWeightUnit(prefs.weightUnit)).toBe('g');
-    expect(parseWeightUnit(prefs.weightUnit, 'lb')).toBe('lb');
+    expect(parseWeightUnit({ value: prefs.weightUnit })).toBe('g');
+    expect(parseWeightUnit({ value: prefs.weightUnit, fallback: 'lb' })).toBe('lb');
   });
 });
diff --git a/packages/units/src/index.ts b/packages/units/src/index.ts
index fb32ae2414..90d22012b5 100644
--- a/packages/units/src/index.ts
+++ b/packages/units/src/index.ts
@@ -16,21 +16,27 @@ const TO_GRAMS = {
  * Normalize a weight value to grams.
  * Use this before summing items with mixed units.
  */
-export function normalize(weight: number, unit: WeightUnit): number {
+export function normalize({ weight, unit }: { weight: number; unit: WeightUnit }): number {
   return weight * TO_GRAMS[unit];
 }
 
 /**
  * Convert grams back to a target unit.
  */
-export function fromGrams(grams: number, unit: WeightUnit): number {
+export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number {
   return grams / TO_GRAMS[unit];
 }
 
 /**
  * Convert directly between any two weight units.
  */
-export function convert(weight: number, units: { from: WeightUnit; to: WeightUnit }): number {
+export function convert({
+  weight,
+  units,
+}: {
+  weight: number;
+  units: { from: WeightUnit; to: WeightUnit };
+}): number {
   if (units.from === units.to) return weight;
   return (weight * TO_GRAMS[units.from]) / TO_GRAMS[units.to];
 }
@@ -39,8 +45,8 @@ export function convert(weight: number, units: { from: WeightUnit; to: WeightUni
  * Format a gram value for display in the given unit, rounded to 2 decimal places.
  * Use this for all weight display — never roll your own toFixed.
  */
-export function displayWeight(grams: number, unit: WeightUnit): number {
-  return parseFloat(fromGrams(grams, unit).toFixed(2));
+export function displayWeight({ grams, unit }: { grams: number; unit: WeightUnit }): number {
+  return parseFloat(fromGrams({ grams, unit }).toFixed(2));
 }
 
 /**
@@ -53,6 +59,12 @@ export function isWeightUnit(value: unknown): value is WeightUnit {
 /**
  * Parse an untrusted string into a WeightUnit, falling back to the default.
  */
-export function parseWeightUnit(value: unknown, fallback: WeightUnit = 'g'): WeightUnit {
+export function parseWeightUnit({
+  value,
+  fallback = 'g',
+}: {
+  value: unknown;
+  fallback?: WeightUnit;
+}): WeightUnit {
   return isWeightUnit(value) ? value : fallback;
 }
diff --git a/packages/web-ui/src/components/chart.tsx b/packages/web-ui/src/components/chart.tsx
index 2f70efc25c..b78a6fc1eb 100644
--- a/packages/web-ui/src/components/chart.tsx
+++ b/packages/web-ui/src/components/chart.tsx
@@ -157,9 +157,12 @@ const ChartTooltipContent = React.forwardRef<HTMLDivElement, ChartTooltipContent
       const [item] = payload;
       assertDefined(item);
       const key = `${labelKey ?? item?.dataKey ?? item?.name ?? 'value'}`;
-      const itemConfig = getPayloadConfigFromPayload(config, {
-        payload: item,
-        key,
+      const itemConfig = getPayloadConfigFromPayload({
+        config,
+        opts: {
+          payload: item,
+          key,
+        },
       });
       const value =
         !labelKey && isString(label)
@@ -197,9 +200,12 @@ const ChartTooltipContent = React.forwardRef<HTMLDivElement, ChartTooltipContent
         <div className="grid gap-1.5">
           {payload.map((item, index) => {
             const key = `${nameKey ?? item.name ?? item.dataKey ?? 'value'}`;
-            const itemConfig = getPayloadConfigFromPayload(config, {
-              payload: item,
-              key,
+            const itemConfig = getPayloadConfigFromPayload({
+              config,
+              opts: {
+                payload: item,
+                key,
+              },
             });
             const indicatorColor = color ?? item.payload?.fill ?? item.color;
 
@@ -303,9 +309,12 @@ const ChartLegendContent = React.forwardRef<HTMLDivElement, ChartLegendContentPr
       >
         {payload.map((item, index) => {
           const key = `${nameKey ?? item.dataKey ?? 'value'}`;
-          const itemConfig = getPayloadConfigFromPayload(config, {
-            payload: item,
-            key,
+          const itemConfig = getPayloadConfigFromPayload({
+            config,
+            opts: {
+              payload: item,
+              key,
+            },
           });
 
           return (
@@ -336,7 +345,13 @@ const ChartLegendContent = React.forwardRef<HTMLDivElement, ChartLegendContentPr
 ChartLegendContent.displayName = 'ChartLegendContent';
 
 // Helper to extract item config from a payload.
-function getPayloadConfigFromPayload(config: ChartConfig, opts: { payload: unknown; key: string }) {
+function getPayloadConfigFromPayload({
+  config,
+  opts,
+}: {
+  config: ChartConfig;
+  opts: { payload: unknown; key: string };
+}) {
   const { payload, key } = opts;
   if (!isObject(payload)) {
     return undefined;
diff --git a/packages/web-ui/src/hooks/use-toast.ts b/packages/web-ui/src/hooks/use-toast.ts
index 24943f6c73..f9c5dda86d 100644
--- a/packages/web-ui/src/hooks/use-toast.ts
+++ b/packages/web-ui/src/hooks/use-toast.ts
@@ -70,7 +70,7 @@ const addToRemoveQueue = (toastId: string) => {
   toastTimeouts.set(toastId, timeout);
 };
 
-export const reducer = (state: State, action: Action): State => {
+export const reducer = ({ state, action }: { state: State; action: Action }): State => {
   switch (action.type) {
     case 'ADD_TOAST':
       return {
@@ -128,7 +128,7 @@ const listeners: Array<(state: State) => void> = [];
 let memoryState: State = { toasts: [] };
 
 function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action);
+  memoryState = reducer({ state: memoryState, action });
   for (const listener of listeners) {
     listener(memoryState);
   }
diff --git a/scripts/check-all.ts b/scripts/check-all.ts
index 5df6de6a9b..154784955a 100644
--- a/scripts/check-all.ts
+++ b/scripts/check-all.ts
@@ -4,6 +4,7 @@
 //
 // Runs the following checks in parallel and prints a unified summary table:
 //   - scripts/lint/no-raw-regex.ts
+//   - scripts/lint/no-owned-max-params.ts
 //   - scripts/lint/no-raw-typeof.ts
 //   - packages/env/scripts/no-raw-process-env.ts
 //   - scripts/lint/no-circular-deps.ts
@@ -58,6 +59,10 @@ const ALL_CHECKS: CheckDef[] = [
     name: 'no-raw-regex',
     script: join(ROOT, 'scripts', 'lint', 'no-raw-regex.ts'),
   },
+  {
+    name: 'no-owned-max-params',
+    script: join(ROOT, 'scripts', 'lint', 'no-owned-max-params.ts'),
+  },
   {
     name: 'no-raw-typeof',
     script: join(ROOT, 'scripts', 'lint', 'no-raw-typeof.ts'),
diff --git a/scripts/lint/no-owned-max-params.ts b/scripts/lint/no-owned-max-params.ts
new file mode 100644
index 0000000000..4c9164fb9d
--- /dev/null
+++ b/scripts/lint/no-owned-max-params.ts
@@ -0,0 +1,267 @@
+#!/usr/bin/env bun
+//
+// no-owned-max-params.ts - enforces object params for owned functions.
+//
+// Biome's useMaxParams rule is intentionally broad, so it also catches JS,
+// React, test, and framework callbacks whose positional signatures are not
+// ours to redesign. Biome stays at max: 2 as a general backstop. This check
+// adds the project-specific rule: owned function definitions should take at
+// most one parameter, while inline callbacks passed to other APIs are ignored.
+
+import { readdirSync, readFileSync, statSync } from 'node:fs';
+import { extname, join } from 'node:path';
+import ts from 'typescript';
+
+const ROOT = join(import.meta.dir, '..', '..');
+const SCAN_ROOTS = ['apps', 'packages'];
+const MAX_OWNED_PARAMS = 1;
+
+const EXCLUDED_DIRS = new Set([
+  'node_modules',
+  'dist',
+  'build',
+  'out',
+  '.next',
+  '.expo',
+  '.turbo',
+  'coverage',
+]);
+
+const EXCLUDED_PATH_PARTS = ['/test/', '/__tests__/', '/mocks/', '/playwright/'];
+const EXCLUDED_FILES = new Set([
+  // This service intentionally mirrors Cloudflare R2's positional API.
+  'packages/api/src/services/r2-bucket.ts',
+  // These build scripts override globalThis.fetch with a shim that must
+  // match the runtime's (input, init) signature.
+  'apps/landing/scripts/generate-og-images.ts',
+  'apps/guides/scripts/generate-og-images.ts',
+]);
+const FRAMEWORK_METHOD_NAMES = new Set(['fetch', 'queue', 'resolveRequest']);
+const EXTERNAL_CALLBACK_NAMES = new Set([
+  'fetcher',
+  'keyExtractor',
+  'list',
+  'onChange',
+  'onContentSizeChange',
+  'onError',
+  'onSettled',
+  'onSuccess',
+  'orderBy',
+  'renderItem',
+  'set',
+  'setItem',
+  'webpack',
+]);
+const TARGET_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts', '.mjs', '.cjs']);
+
+interface Violation {
+  file: string;
+  line: number;
+  column: number;
+  name: string;
+  count: number;
+}
+
+function isTargetFile(relPath: string): boolean {
+  if (EXCLUDED_FILES.has(relPath)) return false;
+  if (EXCLUDED_PATH_PARTS.some((part) => relPath.includes(part))) return false;
+  return TARGET_EXTENSIONS.has(extname(relPath));
+}
+
+function collectFiles(dir: string, relDir: string, files: string[]): void {
+  let entries: string[];
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return;
+  }
+
+  for (const entry of entries) {
+    if (EXCLUDED_DIRS.has(entry)) continue;
+
+    const full = join(dir, entry);
+    const rel = `${relDir}/${entry}`;
+
+    let isDir = false;
+    try {
+      isDir = statSync(full).isDirectory();
+    } catch {
+      continue;
+    }
+
+    if (isDir) {
+      collectFiles(full, rel, files);
+    } else if (isTargetFile(rel)) {
+      files.push(rel);
+    }
+  }
+}
+
+function scriptKindForPath(file: string): ts.ScriptKind {
+  if (file.endsWith('.tsx')) return ts.ScriptKind.TSX;
+  if (file.endsWith('.jsx')) return ts.ScriptKind.JSX;
+  if (file.endsWith('.js') || file.endsWith('.mjs') || file.endsWith('.cjs'))
+    return ts.ScriptKind.JS;
+  return ts.ScriptKind.TS;
+}
+
+function unwrapExpressionParent(node: ts.Node): ts.Node {
+  let current: ts.Node = node;
+
+  while (
+    ts.isParenthesizedExpression(current.parent) ||
+    ts.isAsExpression(current.parent) ||
+    ts.isSatisfiesExpression(current.parent) ||
+    ts.isTypeAssertionExpression(current.parent) ||
+    ts.isNonNullExpression(current.parent)
+  ) {
+    current = current.parent;
+  }
+
+  return current.parent;
+}
+
+function isInlineCallback(node: ts.FunctionLikeDeclaration): boolean {
+  if (!ts.isArrowFunction(node) && !ts.isFunctionExpression(node)) return false;
+
+  const parent = unwrapExpressionParent(node);
+  if (ts.isCallExpression(parent) || ts.isNewExpression(parent)) {
+    return (
+      parent.arguments?.some((argument) => {
+        let current: ts.Node = node;
+        while (current.parent && current.parent !== parent) current = current.parent;
+        return current === argument;
+      }) === true
+    );
+  }
+
+  return false;
+}
+
+function hasBody(node: ts.FunctionLikeDeclaration): boolean {
+  return 'body' in node && node.body !== undefined;
+}
+
+function isAssertionPredicate(node: ts.FunctionLikeDeclaration): boolean {
+  const type = node.type;
+  if (!type) return false;
+  return ts.isTypePredicateNode(type) && type.assertsModifier !== undefined;
+}
+
+function functionName(node: ts.FunctionLikeDeclaration): string {
+  if ('name' in node && node.name) return node.name.getText();
+
+  const parent = node.parent;
+  if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) return parent.name.text;
+  if (ts.isPropertyAssignment(parent)) return parent.name.getText();
+  if (ts.isBinaryExpression(parent) && ts.isPropertyAccessExpression(parent.left)) {
+    return parent.left.name.text;
+  }
+
+  return '<anonymous>';
+}
+
+function isFrameworkObjectMethod(node: ts.FunctionLikeDeclaration): boolean {
+  if (
+    !ts.isMethodDeclaration(node) &&
+    !ts.isFunctionExpression(node) &&
+    !ts.isArrowFunction(node)
+  ) {
+    return false;
+  }
+
+  const name = functionName(node).replace(/^['"]|['"]$/g, '');
+  return FRAMEWORK_METHOD_NAMES.has(name);
+}
+
+function isExternalCallback(node: ts.FunctionLikeDeclaration): boolean {
+  if (EXTERNAL_CALLBACK_NAMES.has(functionName(node).replace(/^['"]|['"]$/g, ''))) return true;
+
+  if (!ts.isArrowFunction(node) && !ts.isFunctionExpression(node)) return false;
+  const parent = unwrapExpressionParent(node);
+
+  if (ts.isPropertyAssignment(parent)) {
+    return EXTERNAL_CALLBACK_NAMES.has(parent.name.getText().replace(/^['"]|['"]$/g, ''));
+  }
+
+  if (
+    ts.isJsxExpression(parent) &&
+    parent.parent &&
+    ts.isJsxAttribute(parent.parent) &&
+    ts.isIdentifier(parent.parent.name)
+  ) {
+    return EXTERNAL_CALLBACK_NAMES.has(parent.parent.name.text);
+  }
+
+  return false;
+}
+
+function shouldCheck(node: ts.FunctionLikeDeclaration): boolean {
+  if (!hasBody(node)) return false;
+  if (isInlineCallback(node)) return false;
+  if (isExternalCallback(node)) return false;
+  if (isAssertionPredicate(node)) return false;
+  if (isFrameworkObjectMethod(node)) return false;
+  if (ts.isGetAccessor(node) || ts.isSetAccessor(node)) return false;
+  return true;
+}
+
+function scanFile(relPath: string, violations: Violation[]): void {
+  let content: string;
+  try {
+    content = readFileSync(join(ROOT, relPath), 'utf8');
+  } catch {
+    return;
+  }
+
+  const sourceFile = ts.createSourceFile(
+    relPath,
+    content,
+    ts.ScriptTarget.Latest,
+    true,
+    scriptKindForPath(relPath),
+  );
+
+  function visit(node: ts.Node): void {
+    if (ts.isFunctionLike(node) && shouldCheck(node) && node.parameters.length > MAX_OWNED_PARAMS) {
+      const pos = sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile));
+      violations.push({
+        file: relPath,
+        line: pos.line + 1,
+        column: pos.character + 1,
+        name: functionName(node),
+        count: node.parameters.length,
+      });
+    }
+
+    ts.forEachChild(node, visit);
+  }
+
+  visit(sourceFile);
+}
+
+const files: string[] = [];
+for (const root of SCAN_ROOTS) {
+  collectFiles(join(ROOT, root), root, files);
+}
+
+const violations: Violation[] = [];
+for (const file of files) {
+  scanFile(file, violations);
+}
+
+if (violations.length > 0) {
+  console.log(
+    `Owned functions with too many params found (${violations.length}). Use one object parameter for owned APIs; inline callbacks passed to external APIs are ignored:\n`,
+  );
+
+  for (const violation of violations) {
+    console.log(
+      `${violation.file}:${violation.line}:${violation.column}: ${violation.name} has ${violation.count} params`,
+    );
+  }
+
+  process.exit(1);
+}
+
+console.log('No owned functions exceed one parameter.');