Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Move diff panel into thread route and lift worker pool provider
Julius Marminge891eb02d49d4
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsxindex face19f29..6510cea7e 100644--- a/apps/web/src/components/DiffPanel.tsx+++ b/apps/web/src/components/DiffPanel.tsx@@ -3,12 +3,11 @@ import {FileDiff,type FileDiffMetadata,Virtualizer,- WorkerPoolContextProvider,} from "@pierre/diffs/react";import { useQuery } from "@tanstack/react-query";import { useNavigate, useParams, useSearch } from "@tanstack/react-router";import { Columns2Icon, Rows3Icon } from "lucide-react";-import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";+import { useEffect, useMemo, useRef, useState } from "react";import { checkpointDiffQueryOptions } from "~/lib/providerReactQuery";import { cn } from "~/lib/utils";import { parseDiffRouteSearch } from "../diffRouteSearch";@@ -77,28 +76,7 @@ interface DiffPanelProps {mode?: "inline" | "sheet";}-export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {- const workerPoolSize = useMemo(() => {- const cores = typeof navigator === "undefined" ? 4 : Math.max(1, navigator.hardwareConcurrency || 4);- return Math.max(2, Math.min(6, Math.floor(cores / 2)));- }, []);-- return (- <WorkerPoolContextProvider- poolOptions={{- workerFactory: () =>- new Worker(new URL("../workers/diffs.worker.ts", import.meta.url), { type: "module" }),- poolSize: workerPoolSize,- totalASTLRUCacheSize: 240,- }}- highlighterOptions={{- tokenizeMaxLineLength: 1_000,- }}- >- {children}- </WorkerPoolContextProvider>- );-}+export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {const api = useNativeApi();diff --git a/apps/web/src/components/DiffWorkerPoolProvider.tsx b/apps/web/src/components/DiffWorkerPoolProvider.tsxnew file mode 100644index 000000000..53939cf81--- /dev/null+++ b/apps/web/src/components/DiffWorkerPoolProvider.tsx@@ -0,0 +1,26 @@+import { WorkerPoolContextProvider } from "@pierre/diffs/react";+import { useMemo, type ReactNode } from "react";++export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {+ const workerPoolSize = useMemo(() => {+ const cores = typeof navigator === "undefined" ? 4 : Math.max(1, navigator.hardwareConcurrency || 4);+ return Math.max(2, Math.min(6, Math.floor(cores / 2)));+ }, []);++ return (+ <WorkerPoolContextProvider+ poolOptions={{+ workerFactory: () =>+ new Worker(new URL("../workers/diffs.worker.ts", import.meta.url), { type: "module" }),+ poolSize: workerPoolSize,+ totalASTLRUCacheSize: 240,+ }}+ highlighterOptions={{+ tokenizeMaxLineLength: 1_000,+ }}+ >+ {children}+ </WorkerPoolContextProvider>+ );+}+diff --git a/apps/web/src/routes/_chat.$threadId.tsx b/apps/web/src/routes/_chat.$threadId.tsxindex 8cca8c2e6..ecf1e2bd5 100644--- a/apps/web/src/routes/_chat.$threadId.tsx+++ b/apps/web/src/routes/_chat.$threadId.tsx@@ -1,15 +1,73 @@import { createFileRoute, useNavigate } from "@tanstack/react-router";-import { useEffect } from "react";+import { Activity, Suspense, lazy, type ReactNode, useCallback, useEffect } from "react";import ChatView from "../components/ChatView";import { parseDiffRouteSearch } from "../diffRouteSearch";+import { useMediaQuery } from "../hooks/useMediaQuery";import { useStore } from "../store";+import { Sheet, SheetPopup } from "../components/ui/sheet";++const DiffPanel = lazy(() => import("../components/DiffPanel"));+const DIFF_INLINE_LAYOUT_MEDIA_QUERY = "(max-width: 1180px)";++const DiffPanelWrapper = (props: {+ children: ReactNode;+ sheet: boolean;+ diffOpen: boolean;+ onCloseDiff: () => void;+}) => {+ if (props.sheet) {+ return (+ <Sheet+ open={props.diffOpen}+ onOpenChange={(open) => {+ if (!open) {+ props.onCloseDiff();+ }+ }}+ >+ <SheetPopup+ side="right"+ showCloseButton={false}+ keepMounted+ className="w-[min(88vw,820px)] max-w-[820px] p-0"+ >+ {props.children}+ </SheetPopup>+ </Sheet>+ );+ }++ return (+ <aside className={props.diffOpen ? undefined : "hidden"} aria-hidden={!props.diffOpen}>+ {props.children}+ </aside>+ );+};function ChatThreadRouteView() {const { state } = useStore();const navigate = useNavigate();const { threadId } = Route.useParams();+ const search = Route.useSearch();const threadExists = threadId ? state.threads.some((thread) => thread.id === threadId) : false;+ const diffOpen = search.diff === "1";+ const shouldUseDiffSheet = useMediaQuery(DIFF_INLINE_LAYOUT_MEDIA_QUERY);+ const closeDiff = useCallback(() => {+ void navigate({+ to: "/$threadId",+ params: { threadId },+ search: (previous) => {+ const {+ diff: _diff,+ diffTurnId: _diffTurnId,+ diffFilePath: _diffFilePath,+ ...rest+ } = previous;+ return rest;+ },+ });+ }, [navigate, threadId]);useEffect(() => {if (!threadId) {@@ -31,10 +89,33 @@ function ChatThreadRouteView() {return null;}- return <ChatView threadId={threadId} />;+ const diffLoadingFallback =+ !diffOpen || shouldUseDiffSheet ? (+ <div className="flex h-full min-h-0 items-center justify-center px-4 text-center text-xs text-muted-foreground/70">+ Loading diff viewer...+ </div>+ ) : (+ <aside className="flex h-full w-[560px] shrink-0 items-center justify-center border-l border-border bg-card px-4 text-center text-xs text-muted-foreground/70">+ Loading diff viewer...+ </aside>+ );++ return (+ <>+ <ChatView threadId={threadId} />+ <Activity mode={diffOpen ? "visible" : "hidden"}>+ <DiffPanelWrapper sheet={shouldUseDiffSheet} diffOpen={diffOpen} onCloseDiff={closeDiff}>+ <Suspense fallback={diffLoadingFallback}>+ <DiffPanel mode={shouldUseDiffSheet ? "sheet" : "inline"} />+ </Suspense>+ </DiffPanelWrapper>+ </Activity>+ </>+ );}export const Route = createFileRoute("/_chat/$threadId")({validateSearch: (search) => parseDiffRouteSearch(search),component: ChatThreadRouteView,});+diff --git a/apps/web/src/routes/_chat.tsx b/apps/web/src/routes/_chat.tsxindex d225a4e33..6f766e44f 100644--- a/apps/web/src/routes/_chat.tsx+++ b/apps/web/src/routes/_chat.tsx@@ -1,112 +1,15 @@-import {- Outlet,- createFileRoute,- useNavigate,- useParams,- useSearch,-} from "@tanstack/react-router";-import { Activity, Suspense, lazy, type ReactNode, useCallback, useMemo } from "react";+import { Outlet, createFileRoute } from "@tanstack/react-router";+import { DiffWorkerPoolProvider } from "../components/DiffWorkerPoolProvider";import Sidebar from "../components/Sidebar";-import { parseDiffRouteSearch } from "../diffRouteSearch";-import { useMediaQuery } from "../hooks/useMediaQuery";-import { Sheet, SheetPopup } from "../components/ui/sheet";--const DiffPanel = lazy(() => import("../components/DiffPanel"));-const DiffWorkerPoolProvider = lazy(() =>- import("../components/DiffPanel").then((module) => ({- default: module.DiffWorkerPoolProvider,- })),-);-const DIFF_INLINE_LAYOUT_MEDIA_QUERY = "(max-width: 1180px)";--const DiffPanelWrapper = (props: {- children: ReactNode;- sheet: boolean;- diffOpen: boolean;- onCloseDiff: () => void;-}) => {- if (props.sheet) {- return (- <Sheet- open={props.diffOpen}- onOpenChange={(open) => {- if (!open) {- props.onCloseDiff();- }- }}- >- <SheetPopup- side="right"- showCloseButton={false}- keepMounted- className="w-[min(88vw,820px)] max-w-[820px] p-0"- >- {props.children}- </SheetPopup>- </Sheet>- );- }-- return (- <aside className={props.diffOpen ? undefined : "hidden"} aria-hidden={!props.diffOpen}>- {props.children}- </aside>- );-};function ChatRouteLayout() {- const navigate = useNavigate();- const params = useParams({ strict: false });- const routeThreadId = typeof params.threadId === "string" ? params.threadId : null;- const rawSearch = useSearch({ strict: false });- const diffSearch = useMemo(- () => parseDiffRouteSearch(rawSearch as Record<string, unknown>),- [rawSearch],- );- const diffOpen = routeThreadId !== null && diffSearch.diff === "1";- const shouldUseDiffSheet = useMediaQuery(DIFF_INLINE_LAYOUT_MEDIA_QUERY);- const closeDiff = useCallback(() => {- if (!routeThreadId) return;- void navigate({- to: "/$threadId",- params: { threadId: routeThreadId },- search: (previous) => {- const {- diff: _diff,- diffTurnId: _diffTurnId,- diffFilePath: _diffFilePath,- ...rest- } = previous;- return rest;- },- });- }, [navigate, routeThreadId]);-- const diffLoadingFallback =- !diffOpen || shouldUseDiffSheet ? (- <div className="flex h-full min-h-0 items-center justify-center px-4 text-center text-xs text-muted-foreground/70">- Loading diff viewer...- </div>- ) : (- <aside className="flex h-full w-[560px] shrink-0 items-center justify-center border-l border-border bg-card px-4 text-center text-xs text-muted-foreground/70">- Loading diff viewer...- </aside>- );-return (<div className="flex h-screen overflow-hidden bg-background text-foreground isolate"><Sidebar />- <Outlet />- <Activity mode={diffOpen ? "visible" : "hidden"}>- <DiffPanelWrapper sheet={shouldUseDiffSheet} diffOpen={diffOpen} onCloseDiff={closeDiff}>- <Suspense fallback={diffLoadingFallback}>- <DiffWorkerPoolProvider>- <DiffPanel mode={shouldUseDiffSheet ? "sheet" : "inline"} />- </DiffWorkerPoolProvider>- </Suspense>- </DiffPanelWrapper>- </Activity>+ <DiffWorkerPoolProvider>+ <Outlet />+ </DiffWorkerPoolProvider></div>);}@@ -114,3 +17,4 @@ function ChatRouteLayout() {export const Route = createFileRoute("/_chat")({component: ChatRouteLayout,});+