Skip to content

Commit 11ba9d1

Browse files
committed
fix(web): remember the last used project for new threads
1 parent eb3e95c commit 11ba9d1

3 files changed

Lines changed: 84 additions & 6 deletions

File tree

‎apps/web/src/components/desktop/SnapShotCoordinator.tsx‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ import {
1313
type PersistedComposerImageAttachment,
1414
useComposerDraftStore,
1515
} from "../../composerDraftStore";
16-
import { useHandleNewThread } from "../../hooks/useHandleNewThread";
16+
import {
17+
LAST_USED_PROJECT_STORAGE_KEY,
18+
lastUsedProjectKeySchema,
19+
useHandleNewThread,
20+
} from "../../hooks/useHandleNewThread";
21+
import { scopedProjectKey } from "@t3tools/client-runtime/environment";
22+
import { useLocalStorage } from "../../hooks/useLocalStorage";
1723
import { useStableCallback } from "../../hooks/useStableCallback";
1824
import { getClientSettings, useClientSettings } from "../../hooks/useSettings";
1925
import { readThreadShell } from "../../state/entities";
@@ -230,6 +236,25 @@ export function SnapShotCoordinator() {
230236
routeDraftId,
231237
routeThreadRef,
232238
} = useHandleNewThread();
239+
const [lastUsedProjectKey, setLastUsedProjectKey] = useLocalStorage(
240+
LAST_USED_PROJECT_STORAGE_KEY,
241+
null,
242+
lastUsedProjectKeySchema,
243+
);
244+
const currentProject = activeThread ?? activeDraftThread;
245+
const currentProjectKey = currentProject
246+
? scopedProjectKey({
247+
environmentId: currentProject.environmentId,
248+
projectId: currentProject.projectId,
249+
})
250+
: null;
251+
const rememberProject = useEffectEvent((projectKey: string) => {
252+
if (projectKey !== lastUsedProjectKey) setLastUsedProjectKey(projectKey);
253+
});
254+
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Persist route changes without overwriting project choices from other tabs.
255+
useEffect(() => {
256+
if (currentProjectKey) rememberProject(currentProjectKey);
257+
}, [currentProjectKey]);
233258
const captureSound = useClientSettings((settings) =>
234259
settings.snapShotPlaySound ? settings.snapShotSound : null,
235260
);

‎apps/web/src/hooks/useHandleNewThread.test.ts‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, expect, it, vi } from "vite-plus/test";
2-
import type { RuntimeMode } from "@t3tools/contracts";
2+
import type { EnvironmentId, ProjectId, RuntimeMode } from "@t3tools/contracts";
33

44
const testState = vi.hoisted(() => {
55
let completeProjectFileRead: (value: null) => void = () => undefined;
@@ -145,7 +145,8 @@ vi.mock("@effect/atom-react", () => ({
145145
: testServerConfigs(),
146146
}));
147147
vi.mock("@t3tools/client-runtime/environment", () => ({
148-
scopedProjectKey: () => "remote-project",
148+
scopedProjectKey: (ref: { environmentId: string; projectId: string }) =>
149+
`${ref.environmentId}:${ref.projectId}`,
149150
scopeProjectRef: (environmentId: string, projectId: string) => ({ environmentId, projectId }),
150151
scopeThreadRef: (environmentId: string, threadId: string) => ({ environmentId, threadId }),
151152
}));
@@ -183,7 +184,9 @@ vi.mock("react", () => ({
183184
useCallback: <T>(callback: T) => callback,
184185
useMemo: <T>(factory: () => T) => factory(),
185186
}));
186-
vi.mock("../components/Sidebar.logic", () => ({ orderItemsByPreferredIds: () => [] }));
187+
vi.mock("../components/Sidebar.logic", () => ({
188+
orderItemsByPreferredIds: ({ items }: { items: unknown[] }) => items,
189+
}));
187190
vi.mock("../composerDraftStore", () => {
188191
const useComposerDraftStore = Object.assign(() => null, {
189192
getState: () => testState.draftStore,
@@ -247,7 +250,7 @@ vi.mock("../uiStateStore", () => ({
247250
}));
248251
vi.mock("./useSettings", () => ({ getClientSettings: () => ({}) }));
249252

250-
import { useNewThreadHandler } from "./useHandleNewThread";
253+
import { resolveDefaultProjectRef, useNewThreadHandler } from "./useHandleNewThread";
251254

252255
describe.each([
253256
["new", null],
@@ -365,3 +368,36 @@ describe("useNewThreadHandler", () => {
365368
expect(testState.router.navigate).toHaveBeenCalledOnce();
366369
});
367370
});
371+
372+
describe("default project selection", () => {
373+
it("prefers the last used project in its environment and falls back when unavailable", () => {
374+
const projects = [
375+
{ id: "project", environmentId: "first", workspaceRoot: "/first" },
376+
{ id: "project", environmentId: "last-used", workspaceRoot: "/last-used" },
377+
].map((project) => ({
378+
...project,
379+
id: project.id as ProjectId,
380+
environmentId: project.environmentId as EnvironmentId,
381+
title: project.environmentId,
382+
defaultModelSelection: null,
383+
scripts: [],
384+
createdAt: "2026-11-09T00:00:00.000Z",
385+
updatedAt: "2026-11-09T00:00:00.000Z",
386+
}));
387+
expect(resolveDefaultProjectRef(projects, [], "last-used:project")).toEqual({
388+
environmentId: "last-used",
389+
projectId: "project",
390+
});
391+
expect(resolveDefaultProjectRef(projects.slice(0, 1), [], "last-used:project")).toEqual({
392+
environmentId: "first",
393+
projectId: "project",
394+
});
395+
expect(
396+
resolveDefaultProjectRef(
397+
[projects[0]!, { ...projects[1]!, archivedAt: "2026-11-09T00:00:00.000Z" }],
398+
[],
399+
"last-used:project",
400+
),
401+
).toEqual({ environmentId: "first", projectId: "project" });
402+
});
403+
});

‎apps/web/src/hooks/useHandleNewThread.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,16 @@ import { environmentServerConfigsAtom } from "../state/server";
4242
import { resolveThreadRouteTarget } from "../threadRoutes";
4343
import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
4444
import { getClientSettings } from "./useSettings";
45+
import { useLocalStorage } from "./useLocalStorage";
46+
import * as Schema from "effect/Schema";
4547
import { useThreadRouteTarget } from "./useThreadRouteTarget";
4648
import { readUnloadedThreadCount } from "../state/olderSettledShelf";
4749
import { resolveProjectDefaultProviderModelSelection } from "../providerInstances";
4850
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
4951

52+
export const LAST_USED_PROJECT_STORAGE_KEY = "t3code:last-used-project:v1";
53+
export const lastUsedProjectKeySchema = Schema.NullOr(Schema.String);
54+
5055
interface NewThreadWorkspaceOptions {
5156
branch?: string | null;
5257
worktreePath?: string | null;
@@ -426,7 +431,14 @@ export function createNewThreadHandler(router: AnyRouter) {
426431
export function resolveDefaultProjectRef(
427432
projects: ReadonlyArray<EnvironmentProject>,
428433
projectOrder: readonly string[],
434+
lastUsedProjectKey: string | null = null,
429435
): ScopedProjectRef | null {
436+
const lastUsed = projects.find(
437+
(project) =>
438+
project.archivedAt == null &&
439+
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)) === lastUsedProjectKey,
440+
);
441+
if (lastUsed) return scopeProjectRef(lastUsed.environmentId, lastUsed.id);
430442
const [defaultProject] = orderItemsByPreferredIds({
431443
items: projects.filter((project) => project.archivedAt == null),
432444
preferredIds: projectOrder,
@@ -441,6 +453,11 @@ export function resolveDefaultProjectRef(
441453

442454
export function useHandleNewThread() {
443455
const projectOrder = useUiStateStore((store) => store.projectOrder);
456+
const [lastUsedProjectKey] = useLocalStorage(
457+
LAST_USED_PROJECT_STORAGE_KEY,
458+
null,
459+
lastUsedProjectKeySchema,
460+
);
444461
const routeTarget = useThreadRouteTarget();
445462
const routeThreadRef = routeTarget?.kind === "server" ? routeTarget.threadRef : null;
446463
const routeDraftId = routeTarget?.kind === "draft" ? routeTarget.draftId : null;
@@ -455,7 +472,7 @@ export function useHandleNewThread() {
455472
);
456473
const projects = useProjects();
457474
const handleNewThread = useNewThreadHandler();
458-
const defaultProjectRef = resolveDefaultProjectRef(projects, projectOrder);
475+
const defaultProjectRef = resolveDefaultProjectRef(projects, projectOrder, lastUsedProjectKey);
459476

460477
return {
461478
activeDraftThread,

0 commit comments

Comments
 (0)