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.
Merge origin/main into codething/53bdee92
Julius Marminge8a72a2a91d52
diff --cc apps/web/src/components/ChatView.tsxindex 4a374b6d6,9039149da..92a6a7392--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@@ -36,7 -35,7 +36,8 @@@ import { projectSearchEntriesQueryOptioimport { serverConfigQueryOptions, serverQueryKeys } from "~/lib/serverReactQuery";import { isElectron } from "../env";+import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";+ import { useAppSettings } from "../appSettings";import { buildBootstrapInput } from "../historyBootstrap";import {type ComposerTriggerKind,@@@ -376,10 -375,9 +377,11 @@@ interface ChatViewPropsexport default function ChatView({ threadId }: ChatViewProps) {const { state, dispatch } = useStore();+ const navigate = useNavigate();+ const rawSearch = useSearch({ strict: false });const api = useNativeApi();const { resolvedTheme } = useTheme();+ const { settings: appSettings } = useAppSettings();const queryClient = useQueryClient();const createWorktreeMutation = useMutation(gitCreateWorktreeMutationOptions({ api, queryClient }),diff --cc apps/web/src/routes/_chat.tsxindex 6f766e44f,ed931773e..36c144559--- a/apps/web/src/routes/_chat.tsx+++ b/apps/web/src/routes/_chat.tsx@@@ -1,9 -1,82 +1,28 @@@- import { Outlet, createFileRoute } from "@tanstack/react-router";+ import { Outlet, createFileRoute, useNavigate } from "@tanstack/react-router";-import { Activity, Suspense, lazy, type ReactNode, useEffect } from "react";++import { useEffect } from "react";+import { DiffWorkerPoolProvider } from "../components/DiffWorkerPoolProvider";import Sidebar from "../components/Sidebar";-import { useMediaQuery } from "../hooks/useMediaQuery";-import { useStore } from "../store";-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 }) => {- const { state, dispatch } = useStore();- if (props.sheet) {- return (- <Sheet- open={state.diffOpen}- onOpenChange={(open) => {- if (!open) {- dispatch({ type: "CLOSE_DIFF" });- }- }}- >- <SheetPopup- side="right"- showCloseButton={false}- keepMounted- className="w-[min(88vw,820px)] max-w-[820px] p-0"- >- {props.children}- </SheetPopup>- </Sheet>- );- }-- return (- <aside className={state.diffOpen ? undefined : "hidden"} aria-hidden={!state.diffOpen}>- {props.children}- </aside>- );-};function ChatRouteLayout() {- const { state } = useStore();- const shouldUseDiffSheet = useMediaQuery(DIFF_INLINE_LAYOUT_MEDIA_QUERY);+ const navigate = useNavigate();++ useEffect(() => {+ const onMenuAction = window.desktopBridge?.onMenuAction;+ if (typeof onMenuAction !== "function") {+ return;+ }++ const unsubscribe = onMenuAction((action) => {+ if (action !== "open-settings") return;+ void navigate({ to: "/settings" });+ });++ return () => {+ unsubscribe?.();+ };+ }, [navigate]);+- const diffLoadingFallback =- !state.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 />