Skip to content

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

Julius Marmingebcf8b14f3834
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
deleted file mode 100644
index e1bcc719b..000000000
--- a/apps/web/src/App.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { RouterProvider } from "@tanstack/react-router";
-
-import { AnchoredToastProvider, ToastProvider } from "./components/ui/toast";
-import { router } from "./router";
-import { StoreProvider } from "./store";
-
-const queryClient = new QueryClient();
-
-export default function App() {
- return (
- <QueryClientProvider client={queryClient}>
- <StoreProvider>
- <ToastProvider>
- <AnchoredToastProvider>
- <RouterProvider router={router} />
- </AnchoredToastProvider>
- </ToastProvider>
- </StoreProvider>
- </QueryClientProvider>
- );
-}
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index aced1f7d4..e11b2d8c3 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -1,11 +1,44 @@
import React from "react";
import ReactDOM from "react-dom/client";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { RouterProvider } from "@tanstack/react-router";
+import { AnchoredToastProvider, ToastProvider } from "./components/ui/toast";
+import { createHashHistory, createRouter, createBrowserHistory } from "@tanstack/react-router";
+import { StoreProvider } from "./store";
+
import "@xterm/xterm/css/xterm.css";
import "highlight.js/styles/github-dark.css";
-
-import App from "./App";
import "./index.css";
+import { isElectron } from "./env";
+import { routeTree } from "./routeTree.gen";
+
+const history = isElectron ? createHashHistory() : createBrowserHistory();
+
+const queryClient = new QueryClient();
+
+const router = createRouter({
+ routeTree,
+ history,
+ context: {
+ queryClient,
+ },
+});
+
+function App() {
+ return (
+ <QueryClientProvider client={queryClient}>
+ <StoreProvider>
+ <ToastProvider>
+ <AnchoredToastProvider>
+ <RouterProvider router={router} />
+ </AnchoredToastProvider>
+ </ToastProvider>
+ </StoreProvider>
+ </QueryClientProvider>
+ );
+}
+
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
<React.StrictMode>
<App />
diff --git a/apps/web/src/router.tsx b/apps/web/src/router.tsx
deleted file mode 100644
index 84438e650..000000000
--- a/apps/web/src/router.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createHashHistory, createRouter } from "@tanstack/react-router";
-
-import { isElectron } from "./env";
-import { routeTree } from "./routeTree.gen";
-
-const useHashHistory =
- isElectron && typeof window !== "undefined" && window.location.protocol === "file:";
-
-export const router = createRouter({
- routeTree,
- ...(useHashHistory ? { history: createHashHistory() } : {}),
-});
-
-declare module "@tanstack/react-router" {
- interface Register {
- router: typeof router;
- }
-}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index ef8760276..a80424217 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { Outlet, createRootRoute } from "@tanstack/react-router";
+import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
import { useEffect, useRef } from "react";
-import { useQueryClient } from "@tanstack/react-query";
+import { QueryClient, useQueryClient } from "@tanstack/react-query";
import { isElectron } from "../env";
import { useNativeApi } from "../hooks/useNativeApi";
@@ -10,6 +10,35 @@ import { createThread } from "../threadFactory";
import { useStore } from "../store";
import { onServerWelcome } from "../wsNativeApi";
+export const Route = createRootRouteWithContext<{
+ queryClient: QueryClient;
+}>()({
+ component: RootRouteView,
+});
+
+function RootRouteView() {
+ const api = useNativeApi();
+
+ if (!api) {
+ return (
+ <div className="flex h-screen flex-col bg-background text-foreground">
+ <div className="flex flex-1 items-center justify-center">
+ <p className="text-sm text-muted-foreground">Connecting to T3 Code server...</p>
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <>
+ <EventRouter />
+ <AutoProjectBootstrap />
+ <DesktopProjectBootstrap />
+ <Outlet />
+ </>
+ );
+}
+
function EventRouter() {
const api = useNativeApi();
const { dispatch } = useStore();
@@ -148,30 +177,3 @@ function DesktopProjectBootstrap() {
return null;
}
-
-function RootRouteView() {
- const api = useNativeApi();
-
- if (!api) {
- return (
- <div className="flex h-screen flex-col bg-background text-foreground">
- <div className="flex flex-1 items-center justify-center">
- <p className="text-sm text-muted-foreground">Connecting to T3 Code server...</p>
- </div>
- </div>
- );
- }
-
- return (
- <>
- <EventRouter />
- <AutoProjectBootstrap />
- <DesktopProjectBootstrap />
- <Outlet />
- </>
- );
-}
-
-export const Route = createRootRoute({
- component: RootRouteView,
-});
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 62632e5e1..6027d50e2 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -1,13 +1,13 @@
import tailwindcss from "@tailwindcss/vite";
import react from "@vitejs/plugin-react";
-import { TanStackRouterVite } from "@tanstack/router-plugin/vite";
+import { tanstackRouter } from "@tanstack/router-plugin/vite";
import { defineConfig } from "vite";
const port = Number(process.env.PORT ?? 5173);
export default defineConfig({
plugins: [
- TanStackRouterVite(),
+ tanstackRouter(),
react({
babel: {
plugins: [["babel-plugin-react-compiler", { target: "19" }]],