From e7214d4e7e78e97b3c6cf0669ecfd37e3aa6f3f7 Mon Sep 17 00:00:00 2001
From: Val Alexander <bunsthedev@gmail.com>
Date: Sat, 4 Apr 2026 14:08:49 -0500
Subject: [PATCH] Remove favorites sidebar feature

- Drop favorites settings and dropdown UI
- Clean up related sidebar references and formatting
---
 apps/marketing/components/OkCodeLogo.tsx      |  13 +-
 apps/web/src/appSettings.ts                   |   3 -
 apps/web/src/components/FavesDropdown.tsx     | 175 ------------------
 apps/web/src/components/OkCodeMark.tsx        |  13 +-
 apps/web/src/components/Sidebar.tsx           |   4 -
 .../src/components/chat/HeaderPanelsMenu.tsx  |  13 +-
 .../merge-conflicts/MergeConflictShell.tsx    |  27 ++-
 apps/web/src/components/skills/SkillsPage.tsx |   7 +-
 apps/web/src/lib/customTheme.ts               |   4 +-
 scripts/update-ios-version.ts                 |  11 +-
 10 files changed, 28 insertions(+), 242 deletions(-)
 delete mode 100644 apps/web/src/components/FavesDropdown.tsx

diff --git a/apps/marketing/components/OkCodeLogo.tsx b/apps/marketing/components/OkCodeLogo.tsx
index a90024c81..2e1c5e699 100644
--- a/apps/marketing/components/OkCodeLogo.tsx
+++ b/apps/marketing/components/OkCodeLogo.tsx
@@ -9,17 +9,8 @@ type OkCodeLogoProps = {
 
 export function OkCodeMark({ className = "w-6 h-6" }: OkCodeMarkProps) {
   return (
-    <svg
-      aria-hidden="true"
-      viewBox="0 0 180 180"
-      fill="none"
-      className={`shrink-0 ${className}`}
-    >
-      <g
-        transform="translate(0,180) scale(0.017578,-0.017578)"
-        fill="currentColor"
-        stroke="none"
-      >
+    <svg aria-hidden="true" viewBox="0 0 180 180" fill="none" className={`shrink-0 ${className}`}>
+      <g transform="translate(0,180) scale(0.017578,-0.017578)" fill="currentColor" stroke="none">
         <path d="M5015 8110 c-49 -4 -112 -14 -138 -23 -26 -10 -53 -17 -60 -17 -12 -1 -152 -69 -218 -107 -91 -52 -379 -311 -379 -339 0 -5 -23 -32 -50 -61 -28 -29 -50 -56 -50 -62 0 -5 -17 -31 -37 -58 -21 -27 -42 -56 -48 -65 -5 -8 -23 -35 -39 -59 -67 -101 -76 -116 -76 -126 0 -6 -6 -16 -14 -22 -19 -16 -138 -260 -188 -386 -22 -55 -48 -116 -58 -137 -10 -20 -24 -56 -30 -80 -6 -23 -15 -52 -19 -63 -5 -11 -16 -36 -24 -55 -9 -20 -21 -57 -26 -83 -6 -25 -17 -64 -25 -84 -8 -21 -20 -65 -26 -98 -7 -33 -20 -87 -31 -120 -18 -59 -49 -212 -49 -243 0 -13 2 -13 18 1 10 9 38 23 62 32 24 9 51 22 60 29 8 7 32 16 53 20 20 4 65 20 100 36 34 17 78 33 97 36 19 4 40 10 45 14 6 4 42 16 82 26 80 20 84 25 108 123 7 31 25 89 39 128 14 40 26 81 26 92 0 10 8 36 19 58 21 43 54 123 84 203 11 30 28 66 37 80 9 14 23 41 30 60 7 19 21 46 30 60 10 14 26 43 37 65 29 59 63 118 79 136 7 8 24 33 36 56 30 53 105 160 139 198 255 283 414 352 634 271 107 -40 288 -194 375 -321 14 -20 42 -58 63 -85 20 -27 37 -52 37 -55 0 -5 36 -62 97 -156 13 -19 23 -41 23 -48 0 -7 14 -33 30 -58 17 -24 30 -49 30 -56 0 -7 11 -32 25 -56 14 -23 25 -48 25 -54 0 -6 15 -42 34 -81 33 -69 50 -115 82 -221 8 -27 19 -59 24 -70 22 -48 50 -127 50 -143 0 -9 12 -53 26 -97 15 -44 34 -132 44 -195 10 -63 24 -145 30 -182 11 -63 8 -469 -3 -573 -12 -101 -39 -272 -47 -290 -4 -11 -18 -58 -30 -105 -26 -101 -61 -211 -71 -225 -4 -5 -12 -26 -17 -45 -21 -72 -70 -189 -91 -218 -11 -17 -21 -34 -21 -39 0 -12 -63 -134 -84 -163 -9 -14 -39 -60 -66 -104 -27 -43 -58 -89 -70 -101 -11 -11 -20 -26 -20 -33 0 -6 -8 -17 -19 -24 -10 -7 -30 -31 -45 -53 -25 -37 -141 -170 -192 -219 -85 -83 -133 -126 -140 -126 -5 0 -24 -14 -43 -31 l-33 -31 38 -31 c46 -39 159 -107 175 -107 7 0 26 -11 43 -23 28 -21 64 -40 198 -102 l38 -17 39 31 c55 44 230 229 254 269 10 17 23 32 28 32 5 0 12 8 16 18 3 9 17 28 30 42 38 39 113 138 113 148 0 5 9 17 20 27 11 10 20 22 20 27 0 5 15 30 32 56 18 26 52 85 77 132 24 47 50 91 58 98 7 7 13 18 13 24 0 6 13 38 29 72 72 152 90 193 96 221 4 17 18 50 31 75 13 25 31 72 40 105 58 210 75 273 80 300 4 17 10 35 14 40 4 6 13 51 20 100 7 50 16 115 21 145 37 229 35 518 -6 820 -23 178 -30 210 -60 310 -7 25 -16 63 -20 85 -4 22 -15 65 -24 95 -10 30 -23 79 -30 108 -7 28 -21 69 -31 90 -10 20 -23 57 -30 82 -6 25 -16 53 -21 62 -5 10 -9 23 -9 29 0 6 -8 23 -19 37 -10 15 -21 40 -25 57 -4 16 -18 54 -32 83 -13 29 -24 57 -24 63 0 6 -13 30 -30 54 -16 24 -30 48 -30 54 0 16 -60 132 -87 167 -13 17 -23 35 -23 40 0 12 -57 103 -99 160 -17 23 -31 45 -31 51 0 5 -13 22 -30 38 -16 16 -30 33 -30 38 0 99 -504 516 -692 572 -29 9 -66 20 -83 25 -16 5 -57 12 -90 15 -33 3 -71 7 -85 9 -14 1 -65 -1 -115 -4z M4839 6065 c-4 -3 -66 -12 -138 -20 -73 -8 -156 -19 -184 -24 -101 -18 -283 -60 -332 -76 -27 -9 -81 -25 -120 -35 -105 -29 -215 -68 -253 -90 -18 -11 -38 -20 -44 -20 -11 0 -143 -57 -244 -106 -28 -13 -55 -24 -59 -24 -4 0 -22 -10 -39 -23 -17 -12 -69 -42 -116 -66 -47 -24 -94 -52 -106 -62 -11 -11 -24 -19 -30 -19 -5 0 -24 -10 -43 -23 -19 -12 -49 -31 -67 -42 -47 -30 -133 -91 -184 -130 -25 -19 -55 -39 -67 -44 -11 -6 -24 -14 -27 -20 -4 -6 -42 -37 -84 -68 -42 -32 -99 -79 -127 -105 -27 -27 -53 -48 -56 -48 -7 0 -58 -49 -230 -217 -114 -112 -176 -179 -244 -263 -20 -25 -47 -58 -61 -75 -39 -48 -88 -116 -102 -141 -7 -13 -17 -24 -22 -24 -5 0 -12 -10 -16 -22 -4 -13 -21 -43 -38 -68 -17 -25 -39 -61 -48 -80 -10 -19 -22 -42 -27 -50 -19 -32 -81 -163 -81 -172 0 -5 -6 -24 -14 -41 -26 -60 -36 -92 -51 -167 -9 -41 -21 -95 -26 -120 -27 -117 -21 -258 16 -395 7 -27 16 -67 19 -87 7 -39 53 -143 106 -238 36 -65 119 -162 186 -221 27 -23 54 -48 59 -56 6 -7 22 -21 36 -31 15 -9 60 -39 100 -67 41 -27 88 -57 104 -65 17 -9 44 -24 60 -33 50 -28 145 -67 161 -67 13 0 81 -25 139 -51 39 -18 258 -63 355 -74 30 -3 82 -10 115 -16 167 -27 582 -27 785 1 41 6 91 12 110 14 19 3 60 7 90 11 30 3 80 12 110 20 30 8 84 19 120 26 36 7 88 21 115 31 28 11 84 28 125 39 41 11 79 24 85 28 5 5 28 13 50 19 43 11 161 60 235 97 25 12 57 25 73 29 39 9 34 18 -31 45 -31 14 -73 37 -93 53 -20 15 -41 28 -47 28 -12 0 -202 141 -221 164 -7 9 -19 16 -27 16 -7 0 -18 9 -24 20 -27 50 -146 56 -204 11 -31 -24 -275 -70 -491 -92 -386 -40 -905 0 -1100 85 -22 9 -68 26 -102 37 -34 11 -73 29 -87 40 -13 10 -28 19 -34 19 -16 0 -126 77 -159 112 -126 130 -155 199 -156 363 0 177 3 201 44 292 10 24 19 50 19 59 0 9 8 28 19 42 10 15 28 47 40 72 40 83 124 212 160 244 12 11 21 23 21 29 0 28 298 346 440 469 41 35 98 86 125 111 28 26 55 47 60 47 6 0 29 18 50 40 21 22 43 40 48 40 4 0 23 11 41 25 18 14 38 25 43 25 6 0 16 7 23 16 18 21 176 126 239 160 28 14 54 30 57 35 3 5 53 32 112 59 59 28 114 55 122 60 8 6 28 15 44 21 15 7 47 22 70 34 24 13 58 26 77 30 19 4 54 17 79 30 25 12 72 30 105 40 33 10 69 24 80 31 12 8 54 20 95 28 41 8 95 21 120 29 25 8 81 20 125 26 44 7 103 16 130 22 309 63 825 40 1140 -51 22 -6 60 -16 85 -21 25 -5 53 -14 62 -19 10 -6 26 -10 36 -10 10 0 23 -5 29 -11 22 -22 29 1 21 78 -4 43 -10 119 -13 168 -17 283 -33 312 -185 335 -30 5 -73 14 -95 20 -148 45 -934 98 -966 65z M6944 5358 c0 -132 -4 -226 -11 -248 -28 -88 -25 -138 11 -163 119 -79 204 -145 346 -266 19 -16 51 -42 70 -58 19 -15 88 -81 152 -146 280 -282 479 -571 558 -812 13 -38 28 -81 34 -94 136 -301 -217 -707 -684 -787 -52 -8 -104 -20 -115 -24 -188 -82 -1107 -32 -1445 79 -52 17 -101 31 -108 31 -7 0 -20 4 -30 10 -20 11 -73 33 -122 50 -19 7 -58 23 -87 36 -28 13 -54 24 -57 24 -3 0 -28 13 -54 30 -27 17 -54 30 -60 30 -11 0 -53 25 -127 77 -21 16 -47 31 -57 35 -24 10 -109 74 -179 134 -31 27 -65 56 -75 64 -98 80 -364 362 -364 386 0 3 -18 26 -40 51 -22 25 -40 51 -40 58 0 6 -9 20 -21 31 -12 10 -30 35 -40 54 -11 19 -32 58 -47 85 -15 28 -37 64 -50 82 -12 17 -22 34 -22 39 0 8 -41 99 -74 164 -13 25 -29 63 -36 85 -6 22 -20 58 -30 80 -21 46 -80 238 -106 340 -9 39 -21 77 -25 87 -5 9 -15 60 -23 113 -16 108 -20 115 -44 97 -9 -7 -37 -21 -62 -32 -25 -11 -52 -24 -60 -29 -8 -6 -39 -22 -67 -36 -29 -15 -53 -30 -53 -35 0 -4 -13 -13 -30 -18 -16 -6 -49 -24 -72 -40 -24 -16 -53 -32 -66 -36 -43 -14 -45 -29 -16 -206 4 -25 11 -53 15 -62 5 -9 15 -50 23 -91 8 -40 26 -101 39 -135 14 -33 28 -76 32 -94 4 -18 20 -59 36 -90 16 -32 29 -62 29 -68 0 -13 40 -104 72 -165 11 -22 29 -58 40 -80 11 -22 24 -47 29 -55 5 -8 17 -31 27 -50 30 -55 90 -151 107 -170 8 -9 15 -20 15 -24 0 -9 35 -59 85 -120 22 -27 47 -59 55 -72 111 -165 518 -552 711 -676 14 -9 32 -23 40 -30 18 -17 104 -69 151 -91 20 -10 40 -22 43 -27 3 -5 56 -34 118 -65 62 -31 116 -61 122 -66 5 -5 17 -9 27 -9 10 0 44 -13 76 -28 66 -32 223 -86 297 -102 28 -6 64 -17 81 -25 63 -30 308 -77 524 -101 316 -35 651 -36 860 -4 36 6 76 11 90 12 61 3 179 20 225 33 28 7 73 19 100 25 57 14 135 40 150 51 6 3 26 10 45 14 19 4 53 15 75 25 22 9 56 23 75 31 19 7 51 23 70 36 19 13 40 23 47 23 6 0 32 16 57 35 26 19 49 35 52 35 69 0 331 277 406 430 120 247 140 397 93 705 -3 22 -25 96 -49 165 -61 176 -67 190 -98 238 -15 24 -28 48 -28 54 0 14 -56 112 -95 165 -16 23 -41 60 -55 84 -14 23 -41 61 -60 84 -19 23 -59 73 -88 111 -163 209 -452 490 -644 627 -37 26 -71 53 -75 60 -4 6 -37 32 -73 56 -36 25 -80 57 -98 73 -18 15 -37 28 -42 28 -6 0 -23 11 -38 25 -24 21 -138 95 -147 95 -2 0 -27 16 -56 35 -30 19 -56 35 -59 35 -4 0 -6 -96 -6 -212z" />
       </g>
     </svg>
diff --git a/apps/web/src/appSettings.ts b/apps/web/src/appSettings.ts
index ac9173d4f..e078b76ff 100644
--- a/apps/web/src/appSettings.ts
+++ b/apps/web/src/appSettings.ts
@@ -89,9 +89,6 @@ export const AppSettingsSchema = Schema.Struct({
   customCodexModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
   customClaudeModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
   textGenerationModel: Schema.optional(TrimmedNonEmptyString),
-  favorites: Schema.Array(Schema.String.check(Schema.isMaxLength(256))).pipe(
-    withDefaults(() => []),
-  ),
 });
 export type AppSettings = typeof AppSettingsSchema.Type;
 export interface AppModelOption {
diff --git a/apps/web/src/components/FavesDropdown.tsx b/apps/web/src/components/FavesDropdown.tsx
deleted file mode 100644
index 1e516967e..000000000
--- a/apps/web/src/components/FavesDropdown.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { HeartIcon, PlusIcon, XIcon } from "lucide-react";
-import { useCallback, useRef, useState } from "react";
-import { useAppSettings } from "../appSettings";
-import { cn } from "../lib/utils";
-import {
-  Menu,
-  MenuGroup,
-  MenuGroupLabel,
-  MenuItem,
-  MenuPopup,
-  MenuSeparator,
-  MenuTrigger,
-} from "./ui/menu";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
-import { SidebarMenuButton } from "./ui/sidebar";
-
-const MAX_FAVORITES = 64;
-const MAX_FAVORITE_LENGTH = 256;
-
-function normalizeFavorite(raw: string): string {
-  return raw.trim().slice(0, MAX_FAVORITE_LENGTH);
-}
-
-export function FavesDropdown() {
-  const { settings, updateSettings } = useAppSettings();
-  const favorites = settings.favorites;
-  const [isAdding, setIsAdding] = useState(false);
-  const [newFav, setNewFav] = useState("");
-  const inputRef = useRef<HTMLInputElement | null>(null);
-
-  const addFavorite = useCallback(
-    (raw: string) => {
-      const value = normalizeFavorite(raw);
-      if (!value) return;
-      if (favorites.includes(value)) return;
-      if (favorites.length >= MAX_FAVORITES) return;
-      updateSettings({ favorites: [...favorites, value] });
-      setNewFav("");
-      setIsAdding(false);
-    },
-    [favorites, updateSettings],
-  );
-
-  const removeFavorite = useCallback(
-    (value: string) => {
-      updateSettings({ favorites: favorites.filter((f) => f !== value) });
-    },
-    [favorites, updateSettings],
-  );
-
-  const handleKeyDown = useCallback(
-    (event: React.KeyboardEvent<HTMLInputElement>) => {
-      if (event.key === "Enter") {
-        event.preventDefault();
-        event.stopPropagation();
-        addFavorite(newFav);
-      }
-      if (event.key === "Escape") {
-        event.preventDefault();
-        event.stopPropagation();
-        setIsAdding(false);
-        setNewFav("");
-      }
-    },
-    [addFavorite, newFav],
-  );
-
-  return (
-    <Menu>
-      <Tooltip>
-        <TooltipTrigger
-          render={
-            <MenuTrigger
-              render={
-                <SidebarMenuButton
-                  size="sm"
-                  className="gap-2 px-2 py-1.5 text-muted-foreground/70 hover:bg-accent hover:text-foreground"
-                />
-              }
-            >
-              <HeartIcon className="size-3.5" />
-              <span className="text-xs">Faves</span>
-              {favorites.length > 0 && (
-                <span className="ml-auto text-[10px] tabular-nums text-muted-foreground/50">
-                  {favorites.length}
-                </span>
-              )}
-            </MenuTrigger>
-          }
-        />
-        <TooltipPopup side="right">Your favorites</TooltipPopup>
-      </Tooltip>
-
-      <MenuPopup side="top" align="start" sideOffset={8} className="min-w-56 max-w-72">
-        <MenuGroup>
-          <MenuGroupLabel>Faves</MenuGroupLabel>
-          {favorites.length === 0 && !isAdding && (
-            <div className="px-3 py-2 text-xs text-muted-foreground/60">
-              No favorites yet. Click + to add one.
-            </div>
-          )}
-          {favorites.map((fav) => (
-            <MenuItem
-              key={fav}
-              className="group/fav-item justify-between gap-2"
-              closeOnClick={false}
-            >
-              <span className="min-w-0 truncate text-xs">{fav}</span>
-              <button
-                type="button"
-                aria-label={`Remove "${fav}" from favorites`}
-                className="invisible shrink-0 rounded p-0.5 text-muted-foreground/50 transition-colors hover:bg-destructive/10 hover:text-destructive-foreground group-hover/fav-item:visible"
-                onClick={(event) => {
-                  event.preventDefault();
-                  event.stopPropagation();
-                  removeFavorite(fav);
-                }}
-              >
-                <XIcon className="size-3" />
-              </button>
-            </MenuItem>
-          ))}
-        </MenuGroup>
-
-        <MenuSeparator />
-
-        {isAdding ? (
-          <div className="flex items-center gap-1.5 px-2 py-1.5">
-            <input
-              ref={inputRef}
-              className="min-w-0 flex-1 rounded-md border border-border bg-secondary px-2 py-1 text-xs text-foreground placeholder:text-muted-foreground/40 outline-none transition-[border-color,box-shadow] duration-150 ease-out focus:border-ring focus:ring-1 focus:ring-ring/20"
-              placeholder="Add a favorite..."
-              value={newFav}
-              onChange={(event) => setNewFav(event.target.value)}
-              onKeyDown={handleKeyDown}
-              autoFocus
-              maxLength={MAX_FAVORITE_LENGTH}
-            />
-            <button
-              type="button"
-              className={cn(
-                "shrink-0 rounded-md px-2 py-1 text-xs font-medium transition-colors duration-150",
-                newFav.trim()
-                  ? "bg-primary text-primary-foreground hover:bg-primary/90"
-                  : "bg-muted text-muted-foreground cursor-not-allowed",
-              )}
-              disabled={!newFav.trim()}
-              onClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                addFavorite(newFav);
-              }}
-            >
-              Add
-            </button>
-          </div>
-        ) : (
-          <MenuItem
-            className="gap-2 text-muted-foreground"
-            closeOnClick={false}
-            onClick={(event) => {
-              event.preventDefault();
-              event.stopPropagation();
-              setIsAdding(true);
-              queueMicrotask(() => inputRef.current?.focus());
-            }}
-          >
-            <PlusIcon className="size-3.5" />
-            <span className="text-xs">Add favorite</span>
-          </MenuItem>
-        )}
-      </MenuPopup>
-    </Menu>
-  );
-}
diff --git a/apps/web/src/components/OkCodeMark.tsx b/apps/web/src/components/OkCodeMark.tsx
index 35ac32b26..4115aeb79 100644
--- a/apps/web/src/components/OkCodeMark.tsx
+++ b/apps/web/src/components/OkCodeMark.tsx
@@ -4,17 +4,8 @@ type OkCodeMarkProps = {
 
 export function OkCodeMark({ className = "size-5" }: OkCodeMarkProps) {
   return (
-    <svg
-      aria-hidden="true"
-      viewBox="0 0 180 180"
-      fill="none"
-      className={`shrink-0 ${className}`}
-    >
-      <g
-        transform="translate(0,180) scale(0.017578,-0.017578)"
-        fill="currentColor"
-        stroke="none"
-      >
+    <svg aria-hidden="true" viewBox="0 0 180 180" fill="none" className={`shrink-0 ${className}`}>
+      <g transform="translate(0,180) scale(0.017578,-0.017578)" fill="currentColor" stroke="none">
         <path d="M5015 8110 c-49 -4 -112 -14 -138 -23 -26 -10 -53 -17 -60 -17 -12 -1 -152 -69 -218 -107 -91 -52 -379 -311 -379 -339 0 -5 -23 -32 -50 -61 -28 -29 -50 -56 -50 -62 0 -5 -17 -31 -37 -58 -21 -27 -42 -56 -48 -65 -5 -8 -23 -35 -39 -59 -67 -101 -76 -116 -76 -126 0 -6 -6 -16 -14 -22 -19 -16 -138 -260 -188 -386 -22 -55 -48 -116 -58 -137 -10 -20 -24 -56 -30 -80 -6 -23 -15 -52 -19 -63 -5 -11 -16 -36 -24 -55 -9 -20 -21 -57 -26 -83 -6 -25 -17 -64 -25 -84 -8 -21 -20 -65 -26 -98 -7 -33 -20 -87 -31 -120 -18 -59 -49 -212 -49 -243 0 -13 2 -13 18 1 10 9 38 23 62 32 24 9 51 22 60 29 8 7 32 16 53 20 20 4 65 20 100 36 34 17 78 33 97 36 19 4 40 10 45 14 6 4 42 16 82 26 80 20 84 25 108 123 7 31 25 89 39 128 14 40 26 81 26 92 0 10 8 36 19 58 21 43 54 123 84 203 11 30 28 66 37 80 9 14 23 41 30 60 7 19 21 46 30 60 10 14 26 43 37 65 29 59 63 118 79 136 7 8 24 33 36 56 30 53 105 160 139 198 255 283 414 352 634 271 107 -40 288 -194 375 -321 14 -20 42 -58 63 -85 20 -27 37 -52 37 -55 0 -5 36 -62 97 -156 13 -19 23 -41 23 -48 0 -7 14 -33 30 -58 17 -24 30 -49 30 -56 0 -7 11 -32 25 -56 14 -23 25 -48 25 -54 0 -6 15 -42 34 -81 33 -69 50 -115 82 -221 8 -27 19 -59 24 -70 22 -48 50 -127 50 -143 0 -9 12 -53 26 -97 15 -44 34 -132 44 -195 10 -63 24 -145 30 -182 11 -63 8 -469 -3 -573 -12 -101 -39 -272 -47 -290 -4 -11 -18 -58 -30 -105 -26 -101 -61 -211 -71 -225 -4 -5 -12 -26 -17 -45 -21 -72 -70 -189 -91 -218 -11 -17 -21 -34 -21 -39 0 -12 -63 -134 -84 -163 -9 -14 -39 -60 -66 -104 -27 -43 -58 -89 -70 -101 -11 -11 -20 -26 -20 -33 0 -6 -8 -17 -19 -24 -10 -7 -30 -31 -45 -53 -25 -37 -141 -170 -192 -219 -85 -83 -133 -126 -140 -126 -5 0 -24 -14 -43 -31 l-33 -31 38 -31 c46 -39 159 -107 175 -107 7 0 26 -11 43 -23 28 -21 64 -40 198 -102 l38 -17 39 31 c55 44 230 229 254 269 10 17 23 32 28 32 5 0 12 8 16 18 3 9 17 28 30 42 38 39 113 138 113 148 0 5 9 17 20 27 11 10 20 22 20 27 0 5 15 30 32 56 18 26 52 85 77 132 24 47 50 91 58 98 7 7 13 18 13 24 0 6 13 38 29 72 72 152 90 193 96 221 4 17 18 50 31 75 13 25 31 72 40 105 58 210 75 273 80 300 4 17 10 35 14 40 4 6 13 51 20 100 7 50 16 115 21 145 37 229 35 518 -6 820 -23 178 -30 210 -60 310 -7 25 -16 63 -20 85 -4 22 -15 65 -24 95 -10 30 -23 79 -30 108 -7 28 -21 69 -31 90 -10 20 -23 57 -30 82 -6 25 -16 53 -21 62 -5 10 -9 23 -9 29 0 6 -8 23 -19 37 -10 15 -21 40 -25 57 -4 16 -18 54 -32 83 -13 29 -24 57 -24 63 0 6 -13 30 -30 54 -16 24 -30 48 -30 54 0 16 -60 132 -87 167 -13 17 -23 35 -23 40 0 12 -57 103 -99 160 -17 23 -31 45 -31 51 0 5 -13 22 -30 38 -16 16 -30 33 -30 38 0 99 -504 516 -692 572 -29 9 -66 20 -83 25 -16 5 -57 12 -90 15 -33 3 -71 7 -85 9 -14 1 -65 -1 -115 -4z M4839 6065 c-4 -3 -66 -12 -138 -20 -73 -8 -156 -19 -184 -24 -101 -18 -283 -60 -332 -76 -27 -9 -81 -25 -120 -35 -105 -29 -215 -68 -253 -90 -18 -11 -38 -20 -44 -20 -11 0 -143 -57 -244 -106 -28 -13 -55 -24 -59 -24 -4 0 -22 -10 -39 -23 -17 -12 -69 -42 -116 -66 -47 -24 -94 -52 -106 -62 -11 -11 -24 -19 -30 -19 -5 0 -24 -10 -43 -23 -19 -12 -49 -31 -67 -42 -47 -30 -133 -91 -184 -130 -25 -19 -55 -39 -67 -44 -11 -6 -24 -14 -27 -20 -4 -6 -42 -37 -84 -68 -42 -32 -99 -79 -127 -105 -27 -27 -53 -48 -56 -48 -7 0 -58 -49 -230 -217 -114 -112 -176 -179 -244 -263 -20 -25 -47 -58 -61 -75 -39 -48 -88 -116 -102 -141 -7 -13 -17 -24 -22 -24 -5 0 -12 -10 -16 -22 -4 -13 -21 -43 -38 -68 -17 -25 -39 -61 -48 -80 -10 -19 -22 -42 -27 -50 -19 -32 -81 -163 -81 -172 0 -5 -6 -24 -14 -41 -26 -60 -36 -92 -51 -167 -9 -41 -21 -95 -26 -120 -27 -117 -21 -258 16 -395 7 -27 16 -67 19 -87 7 -39 53 -143 106 -238 36 -65 119 -162 186 -221 27 -23 54 -48 59 -56 6 -7 22 -21 36 -31 15 -9 60 -39 100 -67 41 -27 88 -57 104 -65 17 -9 44 -24 60 -33 50 -28 145 -67 161 -67 13 0 81 -25 139 -51 39 -18 258 -63 355 -74 30 -3 82 -10 115 -16 167 -27 582 -27 785 1 41 6 91 12 110 14 19 3 60 7 90 11 30 3 80 12 110 20 30 8 84 19 120 26 36 7 88 21 115 31 28 11 84 28 125 39 41 11 79 24 85 28 5 5 28 13 50 19 43 11 161 60 235 97 25 12 57 25 73 29 39 9 34 18 -31 45 -31 14 -73 37 -93 53 -20 15 -41 28 -47 28 -12 0 -202 141 -221 164 -7 9 -19 16 -27 16 -7 0 -18 9 -24 20 -27 50 -146 56 -204 11 -31 -24 -275 -70 -491 -92 -386 -40 -905 0 -1100 85 -22 9 -68 26 -102 37 -34 11 -73 29 -87 40 -13 10 -28 19 -34 19 -16 0 -126 77 -159 112 -126 130 -155 199 -156 363 0 177 3 201 44 292 10 24 19 50 19 59 0 9 8 28 19 42 10 15 28 47 40 72 40 83 124 212 160 244 12 11 21 23 21 29 0 28 298 346 440 469 41 35 98 86 125 111 28 26 55 47 60 47 6 0 29 18 50 40 21 22 43 40 48 40 4 0 23 11 41 25 18 14 38 25 43 25 6 0 16 7 23 16 18 21 176 126 239 160 28 14 54 30 57 35 3 5 53 32 112 59 59 28 114 55 122 60 8 6 28 15 44 21 15 7 47 22 70 34 24 13 58 26 77 30 19 4 54 17 79 30 25 12 72 30 105 40 33 10 69 24 80 31 12 8 54 20 95 28 41 8 95 21 120 29 25 8 81 20 125 26 44 7 103 16 130 22 309 63 825 40 1140 -51 22 -6 60 -16 85 -21 25 -5 53 -14 62 -19 10 -6 26 -10 36 -10 10 0 23 -5 29 -11 22 -22 29 1 21 78 -4 43 -10 119 -13 168 -17 283 -33 312 -185 335 -30 5 -73 14 -95 20 -148 45 -934 98 -966 65z M6944 5358 c0 -132 -4 -226 -11 -248 -28 -88 -25 -138 11 -163 119 -79 204 -145 346 -266 19 -16 51 -42 70 -58 19 -15 88 -81 152 -146 280 -282 479 -571 558 -812 13 -38 28 -81 34 -94 136 -301 -217 -707 -684 -787 -52 -8 -104 -20 -115 -24 -188 -82 -1107 -32 -1445 79 -52 17 -101 31 -108 31 -7 0 -20 4 -30 10 -20 11 -73 33 -122 50 -19 7 -58 23 -87 36 -28 13 -54 24 -57 24 -3 0 -28 13 -54 30 -27 17 -54 30 -60 30 -11 0 -53 25 -127 77 -21 16 -47 31 -57 35 -24 10 -109 74 -179 134 -31 27 -65 56 -75 64 -98 80 -364 362 -364 386 0 3 -18 26 -40 51 -22 25 -40 51 -40 58 0 6 -9 20 -21 31 -12 10 -30 35 -40 54 -11 19 -32 58 -47 85 -15 28 -37 64 -50 82 -12 17 -22 34 -22 39 0 8 -41 99 -74 164 -13 25 -29 63 -36 85 -6 22 -20 58 -30 80 -21 46 -80 238 -106 340 -9 39 -21 77 -25 87 -5 9 -15 60 -23 113 -16 108 -20 115 -44 97 -9 -7 -37 -21 -62 -32 -25 -11 -52 -24 -60 -29 -8 -6 -39 -22 -67 -36 -29 -15 -53 -30 -53 -35 0 -4 -13 -13 -30 -18 -16 -6 -49 -24 -72 -40 -24 -16 -53 -32 -66 -36 -43 -14 -45 -29 -16 -206 4 -25 11 -53 15 -62 5 -9 15 -50 23 -91 8 -40 26 -101 39 -135 14 -33 28 -76 32 -94 4 -18 20 -59 36 -90 16 -32 29 -62 29 -68 0 -13 40 -104 72 -165 11 -22 29 -58 40 -80 11 -22 24 -47 29 -55 5 -8 17 -31 27 -50 30 -55 90 -151 107 -170 8 -9 15 -20 15 -24 0 -9 35 -59 85 -120 22 -27 47 -59 55 -72 111 -165 518 -552 711 -676 14 -9 32 -23 40 -30 18 -17 104 -69 151 -91 20 -10 40 -22 43 -27 3 -5 56 -34 118 -65 62 -31 116 -61 122 -66 5 -5 17 -9 27 -9 10 0 44 -13 76 -28 66 -32 223 -86 297 -102 28 -6 64 -17 81 -25 63 -30 308 -77 524 -101 316 -35 651 -36 860 -4 36 6 76 11 90 12 61 3 179 20 225 33 28 7 73 19 100 25 57 14 135 40 150 51 6 3 26 10 45 14 19 4 53 15 75 25 22 9 56 23 75 31 19 7 51 23 70 36 19 13 40 23 47 23 6 0 32 16 57 35 26 19 49 35 52 35 69 0 331 277 406 430 120 247 140 397 93 705 -3 22 -25 96 -49 165 -61 176 -67 190 -98 238 -15 24 -28 48 -28 54 0 14 -56 112 -95 165 -16 23 -41 60 -55 84 -14 23 -41 61 -60 84 -19 23 -59 73 -88 111 -163 209 -452 490 -644 627 -37 26 -71 53 -75 60 -4 6 -37 32 -73 56 -36 25 -80 57 -98 73 -18 15 -37 28 -42 28 -6 0 -23 11 -38 25 -24 21 -138 95 -147 95 -2 0 -27 16 -56 35 -30 19 -56 35 -59 35 -4 0 -6 -96 -6 -212z" />
       </g>
     </svg>
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 52e9c5048..6090381f1 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -96,7 +96,6 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import { useTheme } from "~/hooks/useTheme";
-import { FavesDropdown } from "~/components/FavesDropdown";
 import {
   computeProjectDisambiguationPaths,
   getVisibleThreadsForProject,
@@ -2207,9 +2206,6 @@ export default function Sidebar() {
                   <span className="text-xs">Skills</span>
                 </SidebarMenuButton>
               </SidebarMenuItem>
-              <SidebarMenuItem>
-                <FavesDropdown />
-              </SidebarMenuItem>
               <SidebarMenuItem>
                 <SidebarMenuButton
                   size="sm"
diff --git a/apps/web/src/components/chat/HeaderPanelsMenu.tsx b/apps/web/src/components/chat/HeaderPanelsMenu.tsx
index 0a6f67076..1f3c301b8 100644
--- a/apps/web/src/components/chat/HeaderPanelsMenu.tsx
+++ b/apps/web/src/components/chat/HeaderPanelsMenu.tsx
@@ -1,9 +1,5 @@
 import { memo, useMemo } from "react";
-import {
-  DiffIcon,
-  MonitorIcon,
-  TerminalSquareIcon,
-} from "lucide-react";
+import { DiffIcon, MonitorIcon, TerminalSquareIcon } from "lucide-react";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { ToggleGroup, Toggle, ToggleGroupSeparator } from "../ui/toggle-group";
 
@@ -43,12 +39,7 @@ export const HeaderPanelsMenu = memo(function HeaderPanelsMenu({
   }, [terminalOpen, previewOpen, diffOpen]);
 
   return (
-    <ToggleGroup
-      value={value}
-      variant="outline"
-      size="xs"
-      className="shrink-0"
-    >
+    <ToggleGroup value={value} variant="outline" size="xs" className="shrink-0">
       <Tooltip>
         <TooltipTrigger
           render={
diff --git a/apps/web/src/components/merge-conflicts/MergeConflictShell.tsx b/apps/web/src/components/merge-conflicts/MergeConflictShell.tsx
index 063681459..c009f78f4 100644
--- a/apps/web/src/components/merge-conflicts/MergeConflictShell.tsx
+++ b/apps/web/src/components/merge-conflicts/MergeConflictShell.tsx
@@ -252,21 +252,18 @@ function MergeConflictGuidanceRail({
   const threads = useStore((s) => s.threads);
   const openCodeViewer = useCodeViewerStore((s) => s.open);
 
-  const navigateToLatestThread = useCallback(
-    () => {
-      openCodeViewer();
-      const sorted = [...threads].sort((a, b) =>
-        (b.updatedAt ?? b.createdAt).localeCompare(a.updatedAt ?? a.createdAt),
-      );
-      const latest = sorted[0];
-      if (latest) {
-        void navigate({ to: "/$threadId", params: { threadId: latest.id } });
-      } else {
-        void navigate({ to: "/" });
-      }
-    },
-    [navigate, openCodeViewer, threads],
-  );
+  const navigateToLatestThread = useCallback(() => {
+    openCodeViewer();
+    const sorted = [...threads].sort((a, b) =>
+      (b.updatedAt ?? b.createdAt).localeCompare(a.updatedAt ?? a.createdAt),
+    );
+    const latest = sorted[0];
+    if (latest) {
+      void navigate({ to: "/$threadId", params: { threadId: latest.id } });
+    } else {
+      void navigate({ to: "/" });
+    }
+  }, [navigate, openCodeViewer, threads]);
 
   return (
     <div className="flex min-h-0 min-w-0 flex-col bg-background/96">
diff --git a/apps/web/src/components/skills/SkillsPage.tsx b/apps/web/src/components/skills/SkillsPage.tsx
index cc70f1389..7a11481db 100644
--- a/apps/web/src/components/skills/SkillsPage.tsx
+++ b/apps/web/src/components/skills/SkillsPage.tsx
@@ -510,11 +510,10 @@ export function SkillsPage(props: {
             <div className="flex items-start gap-3 rounded-2xl border border-destructive/30 bg-destructive/5 p-4">
               <AlertTriangleIcon className="mt-0.5 size-5 shrink-0 text-destructive" />
               <div className="min-w-0 flex-1">
-                <p className="font-medium text-sm text-foreground">
-                  Unable to load skills
-                </p>
+                <p className="font-medium text-sm text-foreground">Unable to load skills</p>
                 <p className="mt-1 text-sm text-muted-foreground">
-                  {queryErrorMessage ?? "The skills service is unavailable. Check that the server is running."}
+                  {queryErrorMessage ??
+                    "The skills service is unavailable. Check that the server is running."}
                 </p>
                 <Button
                   variant="outline"
diff --git a/apps/web/src/lib/customTheme.ts b/apps/web/src/lib/customTheme.ts
index bf13e5c7c..035ad4796 100644
--- a/apps/web/src/lib/customTheme.ts
+++ b/apps/web/src/lib/customTheme.ts
@@ -337,9 +337,7 @@ export async function parseThemeInput(input: string): Promise<CustomThemeData> {
   // 4. CSS
   const parsed = parseThemeCSS(trimmed);
   if (Object.keys(parsed.light).length === 0 && Object.keys(parsed.dark).length === 0) {
-    throw new Error(
-      "No theme variables found. Paste CSS, a tweakcn theme URL, or a theme name.",
-    );
+    throw new Error("No theme variables found. Paste CSS, a tweakcn theme URL, or a theme name.");
   }
 
   return parsed;
diff --git a/scripts/update-ios-version.ts b/scripts/update-ios-version.ts
index 1b9d0d9f0..ad0a3d319 100644
--- a/scripts/update-ios-version.ts
+++ b/scripts/update-ios-version.ts
@@ -34,10 +34,7 @@ export function updateIosVersion(
   const original = content;
 
   // Replace all MARKETING_VERSION = <anything>; with the new version
-  content = content.replace(
-    /MARKETING_VERSION\s*=\s*[^;]+;/g,
-    `MARKETING_VERSION = ${version};`,
-  );
+  content = content.replace(/MARKETING_VERSION\s*=\s*[^;]+;/g, `MARKETING_VERSION = ${version};`);
 
   // Replace all CURRENT_PROJECT_VERSION = <anything>; with the new build number
   content = content.replace(
@@ -110,7 +107,11 @@ const isMain =
 
 if (isMain) {
   const { version, buildNumber, rootDir } = parseArgs(process.argv.slice(2));
-  const { changed } = updateIosVersion(version, buildNumber, rootDir === undefined ? {} : { rootDir });
+  const { changed } = updateIosVersion(
+    version,
+    buildNumber,
+    rootDir === undefined ? {} : { rootDir },
+  );
 
   if (changed) {
     console.log(`Updated iOS version to ${version} (build ${buildNumber}).`);