chore: align branch with main

Author: BunsDev

apps/server/src/prReview/Layers/PrReview.ts

@@ -1,6 +1,7 @@
 import { Effect, Layer } from "effect";
 import type {
   PrConflictAnalysis,
+  GitHubUserPreview,
   PrReviewAddThreadInput,
   PrReviewComment,
   PrReviewConfig,
@@ -12,9 +13,11 @@ import type {
   PrReviewReplyToThreadInput,
   PrReviewResolveThreadInput,
   PrReviewSearchUsersInput,
+  PrReviewSearchUsersResult,
   PrReviewSummary,
   PrReviewUserPreviewInput,
   PrSubmitReviewInput,
+  PrSubmitReviewResult,
   PrWorkflowStepRunResult,
 } from "@okcode/contracts";
 import { GitHubCli } from "../../git/Services/GitHubCli.ts";

apps/web/src/components/CommandPalette.tsx

@@ -92,6 +92,13 @@ function commandScore(command: PaletteCommand, query: string): number {
   return best;
 }
 
+function sortByCommandScore(
+  commands: ReadonlyArray<PaletteCommand>,
+  query: string,
+): PaletteCommand[] {
+  return commands.toSorted((a, b) => commandScore(b, query) - commandScore(a, query));
+}
+
 // ── Command palette component ───────────────────────────────────────
 
 export function CommandPalette() {
@@ -344,9 +351,10 @@ function CommandsView() {
   // Filter commands by query
   const filtered = useMemo(() => {
     if (query.length === 0) return commands;
-    return commands
-      .filter((cmd) => commandMatchesQuery(cmd, query))
-      .toSorted((a, b) => commandScore(b, query) - commandScore(a, query));
+    return sortByCommandScore(
+      commands.filter((cmd) => commandMatchesQuery(cmd, query)),
+      query,
+    );
   }, [commands, query]);
 
   // Group filtered commands
@@ -492,7 +500,7 @@ function ProjectsView() {
         ? projects.filter((p) => fuzzyMatch(query, p.name) || fuzzyMatch(query, p.cwd))
         : projects;
 
-    return [...filtered].toSorted((a, b) => {
+    return filtered.toSorted((a, b) => {
       const aIndex = mruProjectIds.indexOf(a.id);
       const bIndex = mruProjectIds.indexOf(b.id);
       if (aIndex >= 0 && bIndex >= 0) return aIndex - bIndex;

apps/web/src/components/PlanChecklist.tsx

@@ -57,7 +57,7 @@ const PlanChecklist = memo(function PlanChecklist({
       <div className="rounded-xl border border-border/50 bg-background/40">
         {items.map((item, index) => (
           <PlanChecklistRow
-            key={item.text}
+            key={`${item.status}:${item.text}`}
             item={item}
             index={index}
             isLast={index === items.length - 1}

apps/web/src/hooks/useTheme.ts

@@ -1,12 +1,5 @@
 import { useCallback, useEffect, useSyncExternalStore } from "react";
-import {
-  applyCustomTheme,
-  applyFontOverride,
-  applyRadiusOverride,
-  getStoredCustomTheme,
-  initCustomTheme,
-  removeCustomTheme,
-} from "../lib/customTheme";
+import { initCustomTheme } from "../lib/customTheme";
 
 type Theme = "light" | "dark" | "system";
 type ColorTheme =
@@ -16,7 +9,8 @@ type ColorTheme =
   | "midnight-clarity"
   | "carbon"
   | "vapor"
-  | "cathedral-circuit";
+  | "cathedral-circuit"
+  | "custom";
 
 type FontFamily = "dm-sans" | "inter" | "plus-jakarta-sans";
 
@@ -75,7 +69,8 @@ function getStoredColorTheme(): ColorTheme {
     raw === "midnight-clarity" ||
     raw === "carbon" ||
     raw === "vapor" ||
-    raw === "cathedral-circuit"
+    raw === "cathedral-circuit" ||
+    raw === "custom"
   ) {
     return raw;
   }

apps/web/src/routes/_chat.settings.tsx

@@ -39,6 +39,7 @@ import { SidebarTrigger } from "../components/ui/sidebar";
 import { Switch } from "../components/ui/switch";
 import { SidebarInset } from "../components/ui/sidebar";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../components/ui/tooltip";
+import { CustomThemeDialog } from "../components/CustomThemeDialog";
 import { resolveAndPersistPreferredEditor } from "../editorPreferences";
 import { isElectron } from "../env";
 import { useTheme, COLOR_THEMES, FONT_FAMILIES } from "../hooks/useTheme";
@@ -47,6 +48,19 @@ import {
   globalEnvironmentVariablesQueryOptions,
   projectEnvironmentVariablesQueryOptions,
 } from "../lib/environmentVariablesReactQuery";
+import {
+  applyCustomTheme,
+  clearFontOverride,
+  clearRadiusOverride,
+  clearStoredCustomTheme,
+  getStoredCustomTheme,
+  getStoredFontOverride,
+  getStoredRadiusOverride,
+  removeCustomTheme,
+  setStoredFontOverride,
+  setStoredRadiusOverride,
+  type CustomThemeData,
+} from "../lib/customTheme";
 import { serverConfigQueryOptions } from "../lib/serverReactQuery";
 import { cn } from "../lib/utils";
 import { ensureNativeApi, readNativeApi } from "../nativeApi";

apps/web/src/selection-styles.test.ts

@@ -16,7 +16,9 @@ function readSrc(relativePath: string): string {
   return readFileSync(resolve(__dirname, relativePath), "utf-8");
 }
 
-const gamma = (c: number) => (c <= 0.0031308 ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - 0.055);
+function gamma(c: number): number {
+  return c <= 0.0031308 ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - 0.055;
+}
 
 // ═══════════════════════════════════════════════════════════════════════════
 //  oklch → sRGB conversion (used for WCAG contrast checks)

apps/web/tsconfig.json

@@ -6,7 +6,9 @@
     "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "types": ["vite/client"],
     "paths": {
-      "~/*": ["./src/*"]
+      "effect": ["../../node_modules/effect"],
+      "effect/*": ["../../node_modules/effect/*"],
+      "~/*": ["./apps/web/src/*"]
     },
     "plugins": [
       {

bun.lock

@@ -863,5 +863,5 @@ const buildDesktopArtifactCli = Command.make("build-desktop-artifact", {
 Command.run(buildDesktopArtifactCli, { version: "0.0.0" }).pipe(
   Effect.scoped,
   Effect.provide([Logger.layer([Logger.consolePretty()]), NodeServices.layer]),
-  (program) => NodeRuntime.runMain(program as Effect.Effect<void, never, never>),
+  (effect) => NodeRuntime.runMain(effect as never),
 );

scripts/build-desktop-artifact.ts

@@ -555,5 +555,5 @@ const runtimeProgram = Command.run(devRunnerCli, { version: "0.0.0" }).pipe(
 ) as Effect.Effect<void, never, never>;
 
 if (import.meta.main) {
-  NodeRuntime.runMain(runtimeProgram);
+  NodeRuntime.runMain(runtimeProgram as never);
 }