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.

Drive diff panel state from route search params

Julius Marmingecc3e1db22a0a
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 9b5288a4f..fd94dfff9 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -28,6 +28,7 @@ import {
} from "react";
import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
import { useDebouncedValue } from "@tanstack/react-pacer";
+import { useNavigate, useSearch } from "@tanstack/react-router";
import { type VirtualItem, useVirtualizer } from "@tanstack/react-virtual";
import { gitBranchesQueryOptions, gitCreateWorktreeMutationOptions } from "~/lib/gitReactQuery";
import { checkpointDiffQueryOptions } from "~/lib/providerReactQuery";
@@ -35,6 +36,7 @@ import { projectSearchEntriesQueryOptions } from "~/lib/projectReactQuery";
import { serverConfigQueryOptions, serverQueryKeys } from "~/lib/serverReactQuery";
import { isElectron } from "../env";
+import { parseDiffRouteSearch } from "../diffRouteSearch";
import { buildBootstrapInput } from "../historyBootstrap";
import {
type ComposerTriggerKind,
@@ -374,6 +376,8 @@ interface ChatViewProps {
export default function ChatView({ threadId }: ChatViewProps) {
const { state, dispatch } = useStore();
+ const navigate = useNavigate();
+ const rawSearch = useSearch({ strict: false });
const api = useNativeApi();
const { resolvedTheme } = useTheme();
const queryClient = useQueryClient();
@@ -411,6 +415,11 @@ export default function ChatView({ threadId }: ChatViewProps) {
const checkpointTurnCountSyncFingerprintRef = useRef(new Map<string, string>());
const activeThread = state.threads.find((t) => t.id === threadId);
+ const diffSearch = useMemo(
+ () => parseDiffRouteSearch(rawSearch as Record<string, unknown>),
+ [rawSearch],
+ );
+ const diffOpen = diffSearch.diff === "1";
const activeThreadId = activeThread?.id ?? null;
const activeSessionId = activeThread?.session?.sessionId ?? null;
const activeThreadRuntimeId =
@@ -1954,32 +1963,39 @@ export default function ChatView({ threadId }: ChatViewProps) {
setExpandedImage(image);
}, []);
const onToggleDiff = useCallback(() => {
- if (state.diffOpen) {
- dispatch({ type: "CLOSE_DIFF" });
- return;
- }
-
- if (!activeThread) {
- dispatch({ type: "TOGGLE_DIFF" });
- return;
- }
-
- dispatch({
- type: "OPEN_DIFF",
- threadId: activeThread.id,
+ void navigate({
+ to: "/$threadId",
+ params: { threadId },
+ search: (previous) => {
+ const {
+ diff: _diff,
+ diffTurnId: _diffTurnId,
+ diffFilePath: _diffFilePath,
+ ...rest
+ } = previous;
+ return diffOpen ? rest : { ...rest, diff: "1" };
+ },
});
- }, [activeThread, dispatch, state.diffOpen]);
+ }, [diffOpen, navigate, threadId]);
const onOpenTurnDiff = useCallback(
(turnId: string, filePath?: string) => {
- if (!activeThread) return;
- dispatch({
- type: "OPEN_DIFF",
- threadId: activeThread.id,
- turnId,
- ...(filePath ? { filePath } : {}),
+ void navigate({
+ to: "/$threadId",
+ params: { threadId },
+ search: (previous) => {
+ const {
+ diff: _diff,
+ diffTurnId: _diffTurnId,
+ diffFilePath: _diffFilePath,
+ ...rest
+ } = previous;
+ return filePath
+ ? { ...rest, diff: "1", diffTurnId: turnId, diffFilePath: filePath }
+ : { ...rest, diff: "1", diffTurnId: turnId };
+ },
});
},
- [activeThread, dispatch],
+ [navigate, threadId],
);
const onRevertUserMessage = useCallback(
(messageId: string) => {
@@ -2027,7 +2043,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
keybindings={keybindings}
api={api}
gitCwd={gitCwd}
- diffOpen={state.diffOpen}
+ diffOpen={diffOpen}
onRunProjectScript={(script) => {
void runProjectScript(script);
}}
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index 43b191886..face19f29 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -6,11 +6,12 @@ import {
WorkerPoolContextProvider,
} 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 { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
import { checkpointDiffQueryOptions } from "~/lib/providerReactQuery";
import { cn } from "~/lib/utils";
+import { parseDiffRouteSearch } from "../diffRouteSearch";
import { isElectron } from "../env";
import { useNativeApi } from "../hooks/useNativeApi";
import { useTheme } from "../hooks/useTheme";
@@ -101,13 +102,19 @@ export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {
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 params = useParams({ strict: false });
+ const rawSearch = useSearch({ strict: false });
const routeThreadId = typeof params.threadId === "string" ? params.threadId : null;
- const activeThreadId = routeThreadId ?? state.diffThreadId;
+ 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;
@@ -115,10 +122,8 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
- const canApplyStoredTarget = Boolean(activeThread && state.diffThreadId === activeThread.id);
- const selectedTurnId = canApplyStoredTarget ? state.diffTurnId : null;
- const selectedFilePath =
- canApplyStoredTarget && selectedTurnId !== null ? state.diffFilePath : null;
+ const selectedTurnId = diffSearch.diffTurnId ?? null;
+ const selectedFilePath = selectedTurnId !== null ? diffSearch.diffFilePath ?? null : null;
const selectedTurn =
selectedTurnId === null
? undefined
@@ -216,30 +221,36 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
target?.scrollIntoView({ block: "nearest" });
}, [selectedFilePath, renderableFiles]);
- useEffect(() => {
- if (!state.diffOpen) return;
- if (!routeThreadId) return;
- if (state.diffThreadId === routeThreadId) return;
-
- dispatch({
- type: "SET_DIFF_TARGET",
- threadId: routeThreadId,
- });
- }, [dispatch, routeThreadId, state.diffOpen, state.diffThreadId]);
-
const selectTurn = (turnId: string) => {
if (!activeThread) return;
- dispatch({
- type: "SET_DIFF_TARGET",
- threadId: activeThread.id,
- turnId,
+ void navigate({
+ to: "/$threadId",
+ params: { threadId: activeThread.id },
+ search: (previous) => {
+ const {
+ diff: _diff,
+ diffTurnId: _diffTurnId,
+ diffFilePath: _diffFilePath,
+ ...rest
+ } = previous;
+ return { ...rest, diff: "1", diffTurnId: turnId };
+ },
});
};
const selectWholeConversation = () => {
if (!activeThread) return;
- dispatch({
- type: "SET_DIFF_TARGET",
- threadId: activeThread.id,
+ void navigate({
+ to: "/$threadId",
+ params: { threadId: activeThread.id },
+ search: (previous) => {
+ const {
+ diff: _diff,
+ diffTurnId: _diffTurnId,
+ diffFilePath: _diffFilePath,
+ ...rest
+ } = previous;
+ return { ...rest, diff: "1" };
+ },
});
};
@@ -329,13 +340,6 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
) : (
<>
<div ref={patchViewportRef} className="min-h-0 min-w-0 flex-1 overflow-hidden">
- {!canApplyStoredTarget && state.diffThreadId && (
- <div className="px-3 pt-2">
- <p className="mb-2 text-[11px] text-muted-foreground/65">
- Showing diffs for the active thread.
- </p>
- </div>
- )}
{checkpointDiffError && !renderablePatch && (
<div className="px-3">
<p className="mb-2 text-[11px] text-red-500/80">{checkpointDiffError}</p>
diff --git a/apps/web/src/diffRouteSearch.test.ts b/apps/web/src/diffRouteSearch.test.ts
new file mode 100644
index 000000000..becf9e335
--- /dev/null
+++ b/apps/web/src/diffRouteSearch.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vitest";
+
+import { parseDiffRouteSearch } from "./diffRouteSearch";
+
+describe("parseDiffRouteSearch", () => {
+ it("parses valid diff search values", () => {
+ const parsed = parseDiffRouteSearch({
+ diff: "1",
+ diffTurnId: "turn-1",
+ diffFilePath: "src/app.ts",
+ });
+
+ expect(parsed).toEqual({
+ diff: "1",
+ diffTurnId: "turn-1",
+ diffFilePath: "src/app.ts",
+ });
+ });
+
+ it("drops turn and file values when diff is closed", () => {
+ const parsed = parseDiffRouteSearch({
+ diff: "0",
+ diffTurnId: "turn-1",
+ diffFilePath: "src/app.ts",
+ });
+
+ expect(parsed).toEqual({});
+ });
+
+ it("drops file value when turn is not selected", () => {
+ const parsed = parseDiffRouteSearch({
+ diff: "1",
+ diffFilePath: "src/app.ts",
+ });
+
+ expect(parsed).toEqual({
+ diff: "1",
+ });
+ });
+
+ it("normalizes whitespace-only values", () => {
+ const parsed = parseDiffRouteSearch({
+ diff: "1",
+ diffTurnId: " ",
+ diffFilePath: " ",
+ });
+
+ expect(parsed).toEqual({
+ diff: "1",
+ });
+ });
+});
+
diff --git a/apps/web/src/diffRouteSearch.ts b/apps/web/src/diffRouteSearch.ts
new file mode 100644
index 000000000..1b1ccded2
--- /dev/null
+++ b/apps/web/src/diffRouteSearch.ts
@@ -0,0 +1,26 @@
+export interface DiffRouteSearch {
+ diff?: "1";
+ diffTurnId?: string;
+ diffFilePath?: string;
+}
+
+function normalizeSearchString(value: unknown): string | undefined {
+ if (typeof value !== "string") {
+ return undefined;
+ }
+ const normalized = value.trim();
+ return normalized.length > 0 ? normalized : undefined;
+}
+
+export function parseDiffRouteSearch(search: Record<string, unknown>): DiffRouteSearch {
+ const diff = search.diff === "1" ? "1" : undefined;
+ const diffTurnId = diff ? normalizeSearchString(search.diffTurnId) : undefined;
+ const diffFilePath = diff && diffTurnId ? normalizeSearchString(search.diffFilePath) : undefined;
+
+ return {
+ ...(diff ? { diff } : {}),
+ ...(diffTurnId ? { diffTurnId } : {}),
+ ...(diffFilePath ? { diffFilePath } : {}),
+ };
+}
+
diff --git a/apps/web/src/routes/_chat.$threadId.tsx b/apps/web/src/routes/_chat.$threadId.tsx
index 066f657ea..8cca8c2e6 100644
--- a/apps/web/src/routes/_chat.$threadId.tsx
+++ b/apps/web/src/routes/_chat.$threadId.tsx
@@ -2,6 +2,7 @@ import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useEffect } from "react";
import ChatView from "../components/ChatView";
+import { parseDiffRouteSearch } from "../diffRouteSearch";
import { useStore } from "../store";
function ChatThreadRouteView() {
@@ -34,5 +35,6 @@ function ChatThreadRouteView() {
}
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.tsx
index 702e873b0..d225a4e33 100644
--- a/apps/web/src/routes/_chat.tsx
+++ b/apps/web/src/routes/_chat.tsx
@@ -1,9 +1,15 @@
-import { Outlet, createFileRoute } from "@tanstack/react-router";
-import { Activity, Suspense, lazy, type ReactNode } from "react";
+import {
+ Outlet,
+ createFileRoute,
+ useNavigate,
+ useParams,
+ useSearch,
+} from "@tanstack/react-router";
+import { Activity, Suspense, lazy, type ReactNode, useCallback, useMemo } from "react";
import Sidebar from "../components/Sidebar";
+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"));
@@ -14,15 +20,19 @@ const DiffWorkerPoolProvider = lazy(() =>
);
const DIFF_INLINE_LAYOUT_MEDIA_QUERY = "(max-width: 1180px)";
-const DiffPanelWrapper = (props: { children: ReactNode; sheet: boolean }) => {
- const { state, dispatch } = useStore();
+const DiffPanelWrapper = (props: {
+ children: ReactNode;
+ sheet: boolean;
+ diffOpen: boolean;
+ onCloseDiff: () => void;
+}) => {
if (props.sheet) {
return (
<Sheet
- open={state.diffOpen}
+ open={props.diffOpen}
onOpenChange={(open) => {
if (!open) {
- dispatch({ type: "CLOSE_DIFF" });
+ props.onCloseDiff();
}
}}
>
@@ -39,18 +49,42 @@ const DiffPanelWrapper = (props: { children: ReactNode; sheet: boolean }) => {
}
return (
- <aside className={state.diffOpen ? undefined : "hidden"} aria-hidden={!state.diffOpen}>
+ <aside className={props.diffOpen ? undefined : "hidden"} aria-hidden={!props.diffOpen}>
{props.children}
</aside>
);
};
function ChatRouteLayout() {
- const { state } = useStore();
+ 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 =
- !state.diffOpen || shouldUseDiffSheet ? (
+ !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>
@@ -64,8 +98,8 @@ function ChatRouteLayout() {
<div className="flex h-screen overflow-hidden bg-background text-foreground isolate">
<Sidebar />
<Outlet />
- <Activity mode={state.diffOpen ? "visible" : "hidden"}>
- <DiffPanelWrapper sheet={shouldUseDiffSheet}>
+ <Activity mode={diffOpen ? "visible" : "hidden"}>
+ <DiffPanelWrapper sheet={shouldUseDiffSheet} diffOpen={diffOpen} onCloseDiff={closeDiff}>
<Suspense fallback={diffLoadingFallback}>
<DiffWorkerPoolProvider>
<DiffPanel mode={shouldUseDiffSheet ? "sheet" : "inline"} />
diff --git a/apps/web/src/store.test.ts b/apps/web/src/store.test.ts
index e0fa075b3..6acd1e285 100644
--- a/apps/web/src/store.test.ts
+++ b/apps/web/src/store.test.ts
@@ -81,10 +81,6 @@ function makeState(thread: Thread): AppState {
threads: [thread],
threadsHydrated: true,
runtimeMode: "full-access",
- diffOpen: false,
- diffThreadId: null,
- diffTurnId: null,
- diffFilePath: null,
};
}
@@ -149,21 +145,6 @@ describe("store reducer thread continuity", () => {
expect(next.threads[0]?.terminalOpen).toBe(true);
});
- it("opens diff panel with an explicit turn/file target", () => {
- const state = makeState(makeThread());
- const next = reducer(state, {
- type: "OPEN_DIFF",
- threadId: "thread-local-1",
- turnId: "turn-1",
- filePath: "src/app.ts",
- });
-
- expect(next.diffOpen).toBe(true);
- expect(next.diffThreadId).toBe("thread-local-1");
- expect(next.diffTurnId).toBe("turn-1");
- expect(next.diffFilePath).toBe("src/app.ts");
- });
-
it("sets terminal open state per thread", () => {
const state = makeState(makeThread({ terminalOpen: true }));
const next = reducer(state, {
@@ -618,10 +599,6 @@ describe("store reducer thread continuity", () => {
],
threadsHydrated: true,
runtimeMode: "full-access",
- diffOpen: true,
- diffThreadId: "thread-b",
- diffTurnId: "turn-b",
- diffFilePath: "src/removed.ts",
};
const next = reducer(state, {
@@ -645,10 +622,6 @@ describe("store reducer thread continuity", () => {
expect(next.threads).toHaveLength(1);
expect(next.threads[0]?.id).toBe("thread-a");
expect(next.threads[0]?.projectId).toBe("project-new-a");
- expect(next.diffOpen).toBe(false);
- expect(next.diffThreadId).toBeNull();
- expect(next.diffTurnId).toBeNull();
- expect(next.diffFilePath).toBeNull();
});
it("treats empty scripts from sync as authoritative", () => {
@@ -674,10 +647,6 @@ describe("store reducer thread continuity", () => {
threads: [makeThread({ id: "thread-a", projectId: "project-old-a" })],
threadsHydrated: true,
runtimeMode: "full-access",
- diffOpen: false,
- diffThreadId: null,
- diffTurnId: null,
- diffFilePath: null,
};
const next = reducer(state, {
@@ -766,10 +735,6 @@ describe("store reducer thread continuity", () => {
],
threadsHydrated: true,
runtimeMode: "full-access",
- diffOpen: true,
- diffThreadId: "thread-a",
- diffTurnId: "turn-a",
- diffFilePath: "src/a.ts",
};
const next = reducer(state, {
@@ -781,10 +746,6 @@ describe("store reducer thread continuity", () => {
expect(next.projects[0]?.id).toBe("project-2");
expect(next.threads).toHaveLength(1);
expect(next.threads[0]?.id).toBe("thread-b");
- expect(next.diffOpen).toBe(false);
- expect(next.diffThreadId).toBeNull();
- expect(next.diffTurnId).toBeNull();
- expect(next.diffFilePath).toBeNull();
});
it("marks completion as seen immediately for the active thread", () => {
@@ -833,48 +794,6 @@ describe("store reducer thread continuity", () => {
expect(next.threads[0]?.lastVisitedAt).toBe(nextVisitedAt);
});
- it("retargets open diff state to the visited thread", () => {
- const state: AppState = {
- ...makeState(
- makeThread({
- id: "thread-local-1",
- latestTurnCompletedAt: "2026-02-08T10:00:10.000Z",
- lastVisitedAt: "2026-02-08T10:00:00.000Z",
- }),
- ),
- threads: [
- makeThread({
- id: "thread-local-1",
- latestTurnCompletedAt: "2026-02-08T10:00:10.000Z",
- lastVisitedAt: "2026-02-08T10:00:00.000Z",
- }),
- makeThread({
- id: "thread-local-2",
- session: makeSession({ sessionId: "sess-2" }),
- latestTurnCompletedAt: "2026-02-08T09:00:10.000Z",
- lastVisitedAt: "2026-02-08T09:00:00.000Z",
- }),
- ],
- diffOpen: true,
- diffThreadId: "thread-local-1",
- diffTurnId: "turn-1",
- diffFilePath: "src/old.ts",
- };
-
- const nextVisitedAt = "2026-02-08T10:00:20.000Z";
- const next = reducer(state, {
- type: "MARK_THREAD_VISITED",
- threadId: "thread-local-2",
- visitedAt: nextVisitedAt,
- });
-
- expect(next.threads[1]?.lastVisitedAt).toBe(nextVisitedAt);
- expect(next.diffOpen).toBe(true);
- expect(next.diffThreadId).toBe("thread-local-2");
- expect(next.diffTurnId).toBeNull();
- expect(next.diffFilePath).toBeNull();
- });
-
it("reverts thread state to a checkpoint snapshot", () => {
const state = makeState(
makeThread({
diff --git a/apps/web/src/store.ts b/apps/web/src/store.ts
index 2784547fe..cb45b5506 100644
--- a/apps/web/src/store.ts
+++ b/apps/web/src/store.ts
@@ -48,20 +48,6 @@ type Action =
| { type: "NEW_THREAD_TERMINAL"; threadId: string; terminalId: string }
| { type: "SET_THREAD_ACTIVE_TERMINAL"; threadId: string; terminalId: string }
| { type: "CLOSE_THREAD_TERMINAL"; threadId: string; terminalId: string }
- | { type: "TOGGLE_DIFF" }
- | {
- type: "OPEN_DIFF";
- threadId: string;
- turnId?: string;
- filePath?: string;
- }
- | {
- type: "SET_DIFF_TARGET";
- threadId: string;
- turnId?: string;
- filePath?: string;
- }
- | { type: "CLOSE_DIFF" }
| {
type: "APPLY_EVENT";
event: ProviderEvent;
@@ -110,10 +96,6 @@ export interface AppState {
threads: Thread[];
threadsHydrated: boolean;
runtimeMode: RuntimeMode;
- diffOpen: boolean;
- diffThreadId: string | null;
- diffTurnId: string | null;
- diffFilePath: string | null;
}
const PERSISTED_STATE_KEY = "t3code:renderer-state:v7";
@@ -133,10 +115,6 @@ const initialState: AppState = {
threads: [],
threadsHydrated: false,
runtimeMode: DEFAULT_RUNTIME_MODE,
- diffOpen: false,
- diffThreadId: null,
- diffTurnId: null,
- diffFilePath: null,
};
// ── Helpers ──────────────────────────────────────────────────────────
@@ -160,10 +138,6 @@ function readPersistedState(): AppState {
...hydrated,
threads,
threadsHydrated: threads.length > 0,
- diffOpen: false,
- diffThreadId: null,
- diffTurnId: null,
- diffFilePath: null,
};
} catch {
return initialState;
@@ -191,32 +165,6 @@ function updateThread(
return threads.map((t) => (t.id === threadId ? updater(t) : t));
}
-function resetDiffTargetIfMissing(state: AppState, threads: Thread[]) {
- if (!state.diffThreadId) {
- return {
- diffOpen: state.diffOpen,
- diffThreadId: state.diffThreadId,
- diffTurnId: state.diffTurnId,
- diffFilePath: state.diffFilePath,
- };
- }
- const hasThread = threads.some((thread) => thread.id === state.diffThreadId);
- if (hasThread) {
- return {
- diffOpen: state.diffOpen,
- diffThreadId: state.diffThreadId,
- diffTurnId: state.diffTurnId,
- diffFilePath: state.diffFilePath,
- };
- }
- return {
- diffOpen: false,
- diffThreadId: null,
- diffTurnId: null,
- diffFilePath: null,
- };
-}
-
function mergeTurnDiffSummaries(
existing: Thread["turnDiffSummaries"],
next: Thread["turnDiffSummaries"],
@@ -615,13 +563,11 @@ export function reducer(state: AppState, action: Action): AppState {
});
})
.filter((thread): thread is Thread => thread !== null);
- const diffState = resetDiffTargetIfMissing(state, nextThreads);
return {
...state,
projects: nextProjects,
threads: nextThreads,
- ...diffState,
};
}
@@ -640,13 +586,11 @@ export function reducer(state: AppState, action: Action): AppState {
}
const threads = state.threads.filter((thread) => thread.projectId !== action.projectId);
- const diffState = resetDiffTargetIfMissing(state, threads);
return {
...state,
projects,
threads,
- ...diffState,
};
}
@@ -830,29 +774,6 @@ export function reducer(state: AppState, action: Action): AppState {
),
};
- case "TOGGLE_DIFF":
- return { ...state, diffOpen: !state.diffOpen };
-
- case "OPEN_DIFF":
- return {
- ...state,
- diffOpen: true,
- diffThreadId: action.threadId,
- diffTurnId: action.turnId ?? null,
- diffFilePath: action.filePath ?? null,
- };
-
- case "SET_DIFF_TARGET":
- return {
- ...state,
- diffThreadId: action.threadId,
- diffTurnId: action.turnId ?? null,
- diffFilePath: action.filePath ?? null,
- };
-
- case "CLOSE_DIFF":
- return { ...state, diffOpen: false };
-
case "APPLY_TERMINAL_EVENT":
if (!state.threads.some((thread) => thread.id === action.event.threadId)) {
return state;
@@ -1078,16 +999,12 @@ export function reducer(state: AppState, action: Action): AppState {
case "MARK_THREAD_VISITED": {
const visitedAt = action.visitedAt ?? new Date().toISOString();
- const shouldRetargetOpenDiff = state.diffOpen && state.diffThreadId !== action.threadId;
return {
...state,
threads: updateThread(state.threads, action.threadId, (t) => ({
...t,
lastVisitedAt: visitedAt,
})),
- diffThreadId: shouldRetargetOpenDiff ? action.threadId : state.diffThreadId,
- diffTurnId: shouldRetargetOpenDiff ? null : state.diffTurnId,
- diffFilePath: shouldRetargetOpenDiff ? null : state.diffFilePath,
};
}
@@ -1097,15 +1014,11 @@ export function reducer(state: AppState, action: Action): AppState {
runtimeMode: action.mode,
};
- case "DELETE_THREAD": {
- const threads = state.threads.filter((t) => t.id !== action.threadId);
- const diffState = resetDiffTargetIfMissing(state, threads);
+ case "DELETE_THREAD":
return {
...state,
- threads,
- ...diffState,
+ threads: state.threads.filter((t) => t.id !== action.threadId),
};
- }
default:
return state;