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.

Merge origin/main into codething/c71d8ea1

Julius Marmingea002239fc407
diff --cc apps/web/src/components/DiffPanel.tsx
index 394631c10,33149c508..660b13de8
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@@ -1,24 -1,12 +1,19 @@@
import { parsePatchFiles } from "@pierre/diffs";
- import {
- FileDiff,
- type FileDiffMetadata,
- Virtualizer,
- WorkerPoolContextProvider,
- } from "@pierre/diffs/react";
+ import { FileDiff, type FileDiffMetadata, Virtualizer } from "@pierre/diffs/react";
import { useQuery } from "@tanstack/react-query";
- import { useParams } from "@tanstack/react-router";
+ import { useNavigate, useParams, useSearch } from "@tanstack/react-router";
-import { Columns2Icon, Rows3Icon } from "lucide-react";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { ChevronLeftIcon, ChevronRightIcon, Columns2Icon, Rows3Icon } from "lucide-react";
+import {
- type ReactNode,
+ type WheelEvent as ReactWheelEvent,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
import { checkpointDiffQueryOptions } from "~/lib/providerReactQuery";
import { cn } from "~/lib/utils";
+ import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
import { isElectron } from "../env";
import { useNativeApi } from "../hooks/useNativeApi";
import { useTheme } from "../hooks/useTheme";
@@@ -115,16 -76,19 +89,22 @@@ export { DiffWorkerPoolProvider } from
export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
const api = useNativeApi();
+ const navigate = useNavigate();
const { resolvedTheme } = useTheme();
- const { state, dispatch } = useStore();
+ const { state } = useStore();
const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");
const patchViewportRef = useRef<HTMLDivElement>(null);
+ const turnStripRef = useRef<HTMLDivElement>(null);
+ const [canScrollTurnStripLeft, setCanScrollTurnStripLeft] = useState(false);
+ const [canScrollTurnStripRight, setCanScrollTurnStripRight] = useState(false);
const params = useParams({ strict: false });
+ const rawSearch = useSearch({ strict: false });
const routeThreadId = typeof params.threadId === "string" ? params.threadId : null;
- const activeThreadId = state.diffThreadId ?? routeThreadId;
+ const diffSearch = useMemo(
+ () => parseDiffRouteSearch(rawSearch as Record<string, unknown>),
+ [rawSearch],
+ );
+ const activeThreadId = routeThreadId;
const activeThread = state.threads.find((thread) => thread.id === activeThreadId);
const activeThreadRuntimeId =
activeThread?.codexThreadId ?? activeThread?.session?.threadId ?? null;
@@@ -243,66 -208,15 +224,70 @@@
};
const selectWholeConversation = () => {
if (!activeThread) return;
- dispatch({
- type: "SET_DIFF_TARGET",
- threadId: activeThread.id,
+ void navigate({
+ to: "/$threadId",
+ params: { threadId: activeThread.id },
+ search: (previous) => {
+ const rest = stripDiffSearchParams(previous);
+ return { ...rest, diff: "1" };
+ },
});
};
+ const updateTurnStripScrollState = useCallback(() => {
+ const element = turnStripRef.current;
+ if (!element) {
+ setCanScrollTurnStripLeft(false);
+ setCanScrollTurnStripRight(false);
+ return;
+ }
+
+ const maxScrollLeft = Math.max(0, element.scrollWidth - element.clientWidth);
+ setCanScrollTurnStripLeft(element.scrollLeft > 4);
+ setCanScrollTurnStripRight(element.scrollLeft < maxScrollLeft - 4);
+ }, []);
+ const scrollTurnStripBy = useCallback((offset: number) => {
+ const element = turnStripRef.current;
+ if (!element) return;
+ element.scrollBy({ left: offset, behavior: "smooth" });
+ }, []);
+ const onTurnStripWheel = useCallback((event: ReactWheelEvent<HTMLDivElement>) => {
+ const element = turnStripRef.current;
+ if (!element) return;
+ if (element.scrollWidth <= element.clientWidth + 1) return;
+ if (Math.abs(event.deltaY) <= Math.abs(event.deltaX)) return;
+
+ event.preventDefault();
+ element.scrollBy({ left: event.deltaY, behavior: "auto" });
+ }, []);
+
+ useEffect(() => {
+ const element = turnStripRef.current;
+ if (!element) return;
+
+ updateTurnStripScrollState();
+ const onScroll = () => updateTurnStripScrollState();
+ element.addEventListener("scroll", onScroll, { passive: true });
+
+ const resizeObserver = new ResizeObserver(() => updateTurnStripScrollState());
+ resizeObserver.observe(element);
+
+ return () => {
+ element.removeEventListener("scroll", onScroll);
+ resizeObserver.disconnect();
+ };
+ }, [updateTurnStripScrollState]);
+
+ useEffect(() => {
+ updateTurnStripScrollState();
+ }, [turnDiffSummaries, selectedTurnId, updateTurnStripScrollState]);
+
+ useEffect(() => {
+ const element = turnStripRef.current;
+ if (!element) return;
+
+ const selectedChip = element.querySelector<HTMLElement>("[data-turn-chip-selected='true']");
+ selectedChip?.scrollIntoView({ block: "nearest", inline: "nearest", behavior: "smooth" });
+ }, [selectedTurn?.turnId, selectedTurnId]);
const shouldUseDragRegion = isElectron && mode === "inline";