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.

error component

Julius Marminged8412eca9f68
diff --git a/apps/web/src/diffRouteSearch.test.ts b/apps/web/src/diffRouteSearch.test.ts
index becf9e335..ef00874bd 100644
--- a/apps/web/src/diffRouteSearch.test.ts
+++ b/apps/web/src/diffRouteSearch.test.ts
@@ -17,6 +17,28 @@ describe("parseDiffRouteSearch", () => {
});
});
+ it("treats numeric and boolean diff toggles as open", () => {
+ expect(
+ parseDiffRouteSearch({
+ diff: 1,
+ diffTurnId: "turn-1",
+ }),
+ ).toEqual({
+ diff: "1",
+ diffTurnId: "turn-1",
+ });
+
+ expect(
+ parseDiffRouteSearch({
+ diff: true,
+ diffTurnId: "turn-1",
+ }),
+ ).toEqual({
+ diff: "1",
+ diffTurnId: "turn-1",
+ });
+ });
+
it("drops turn and file values when diff is closed", () => {
const parsed = parseDiffRouteSearch({
diff: "0",
@@ -50,4 +72,3 @@ describe("parseDiffRouteSearch", () => {
});
});
});
-
diff --git a/apps/web/src/diffRouteSearch.ts b/apps/web/src/diffRouteSearch.ts
index fd3d6cae7..7a2544d66 100644
--- a/apps/web/src/diffRouteSearch.ts
+++ b/apps/web/src/diffRouteSearch.ts
@@ -4,6 +4,10 @@ export interface DiffRouteSearch {
diffFilePath?: string;
}
+function isDiffOpenValue(value: unknown): boolean {
+ return value === "1" || value === 1 || value === true;
+}
+
function normalizeSearchString(value: unknown): string | undefined {
if (typeof value !== "string") {
return undefined;
@@ -20,7 +24,7 @@ export function stripDiffSearchParams<T extends Record<string, unknown>>(
}
export function parseDiffRouteSearch(search: Record<string, unknown>): DiffRouteSearch {
- const diff = search.diff === "1" ? "1" : undefined;
+ const diff = isDiffOpenValue(search.diff) ? "1" : undefined;
const diffTurnId = diff ? normalizeSearchString(search.diffTurnId) : undefined;
const diffFilePath = diff && diffTurnId ? normalizeSearchString(search.diffFilePath) : undefined;
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index 78b887c6f..1e7bd0d84 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -1,7 +1,14 @@
-import { Outlet, createRootRouteWithContext, useParams } from "@tanstack/react-router";
+import {
+ Outlet,
+ createRootRouteWithContext,
+ type ErrorComponentProps,
+ useParams,
+} from "@tanstack/react-router";
import { useEffect, useRef } from "react";
import { QueryClient, useQueryClient } from "@tanstack/react-query";
+import { APP_DISPLAY_NAME } from "../branding";
+import { Button } from "../components/ui/button";
import { AnchoredToastProvider, ToastProvider } from "../components/ui/toast";
import { isElectron } from "../env";
import { useNativeApi } from "../hooks/useNativeApi";
@@ -9,12 +16,12 @@ import { invalidateGitQueries } from "../lib/gitReactQuery";
import { DEFAULT_MODEL } from "../model-logic";
import { useStore } from "../store";
import { onServerWelcome } from "../wsNativeApi";
-import { APP_DISPLAY_NAME } from "../branding";
export const Route = createRootRouteWithContext<{
queryClient: QueryClient;
}>()({
component: RootRouteView,
+ errorComponent: RootRouteErrorView,
});
function RootRouteView() {
@@ -44,6 +51,77 @@ function RootRouteView() {
);
}
+function RootRouteErrorView({ error, reset }: ErrorComponentProps) {
+ const message = errorMessage(error);
+ const details = errorDetails(error);
+
+ return (
+ <div className="relative flex min-h-screen items-center justify-center overflow-hidden bg-background px-4 py-10 text-foreground sm:px-6">
+ <div className="pointer-events-none absolute inset-0 opacity-80">
+ <div className="absolute inset-x-0 top-0 h-44 bg-[radial-gradient(44rem_16rem_at_top,color-mix(in_srgb,var(--color-red-500)_16%,transparent),transparent)]" />
+ <div className="absolute inset-0 bg-[linear-gradient(145deg,color-mix(in_srgb,var(--background)_90%,var(--color-black))_0%,var(--background)_55%)]" />
+ </div>
+
+ <section className="relative w-full max-w-xl rounded-2xl border border-border/80 bg-card/90 p-6 shadow-2xl shadow-black/20 backdrop-blur-md sm:p-8">
+ <p className="text-[11px] font-semibold tracking-[0.18em] text-muted-foreground uppercase">
+ {APP_DISPLAY_NAME}
+ </p>
+ <h1 className="mt-3 text-2xl font-semibold tracking-tight sm:text-3xl">
+ Something went wrong.
+ </h1>
+ <p className="mt-2 text-sm leading-relaxed text-muted-foreground">{message}</p>
+
+ <div className="mt-5 flex flex-wrap gap-2">
+ <Button size="sm" onClick={() => reset()}>
+ Try again
+ </Button>
+ <Button size="sm" variant="outline" onClick={() => window.location.reload()}>
+ Reload app
+ </Button>
+ </div>
+
+ <details className="group mt-5 overflow-hidden rounded-lg border border-border/70 bg-background/55">
+ <summary className="cursor-pointer list-none px-3 py-2 text-xs font-medium text-muted-foreground">
+ <span className="group-open:hidden">Show error details</span>
+ <span className="hidden group-open:inline">Hide error details</span>
+ </summary>
+ <pre className="max-h-56 overflow-auto border-t border-border/70 bg-background/80 px-3 py-2 text-xs text-foreground/85">
+ {details}
+ </pre>
+ </details>
+ </section>
+ </div>
+ );
+}
+
+function errorMessage(error: unknown): string {
+ if (error instanceof Error && error.message.trim().length > 0) {
+ return error.message;
+ }
+
+ if (typeof error === "string" && error.trim().length > 0) {
+ return error;
+ }
+
+ return "An unexpected router error occurred.";
+}
+
+function errorDetails(error: unknown): string {
+ if (error instanceof Error) {
+ return error.stack ?? error.message;
+ }
+
+ if (typeof error === "string") {
+ return error;
+ }
+
+ try {
+ return JSON.stringify(error, null, 2);
+ } catch {
+ return "No additional error details are available.";
+ }
+}
+
function EventRouter() {
const api = useNativeApi();
const { dispatch } = useStore();
diff --git a/apps/web/src/routes/_chat.$threadId.tsx b/apps/web/src/routes/_chat.$threadId.tsx
index 8bb8aa389..5efee58f5 100644
--- a/apps/web/src/routes/_chat.$threadId.tsx
+++ b/apps/web/src/routes/_chat.$threadId.tsx
@@ -1,5 +1,5 @@
import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import { Activity, Suspense, lazy, type ReactNode, useCallback, useEffect } from "react";
+import { Suspense, lazy, type ReactNode, useCallback, useEffect } from "react";
import ChatView from "../components/ChatView";
import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
@@ -97,13 +97,11 @@ function ChatThreadRouteView() {
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>
+ <DiffPanelWrapper sheet={shouldUseDiffSheet} diffOpen={diffOpen} onCloseDiff={closeDiff}>
+ <Suspense fallback={diffLoadingFallback}>
+ <DiffPanel mode={shouldUseDiffSheet ? "sheet" : "inline"} />
+ </Suspense>
+ </DiffPanelWrapper>
</>
);
}