Skip to content

Commit 6f8c743

Browse files
authored
fix(web): new threads use the last used project
New threads started without an active thread or draft used the first project in sidebar order, even after working in another project. This was visible when creating a draft from Settings or delivering a pending snapshot after reopening the app. Remember the project from the current thread or draft, including its environment, and prefer it when a new draft needs a project. Removed or archived projects fall back to sidebar order. The new-thread keyboard shortcut reads the same preference when invoked. Pending snapshots wait while the remembered environment loads and retry when its project state becomes available. Validation: regression coverage for project selection across environments, missing and archived projects, and a preference changed after shortcut registration. Verified Settings → reload → New thread in the client. `vp run check:changed` covers formatting, lint, affected typechecks, tests, and React compiler checks. Model: GPT 6.1 Sol via the Codex harness.
1 parent eb381a7 commit 6f8c743

8 files changed

Lines changed: 209 additions & 13 deletions

File tree

‎apps/web/src/components/Sidebar.browser.test.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ describe("sidebar header new thread", () => {
6161
activeDraftThread: null,
6262
activeThread: null,
6363
defaultProjectRef: currentProjectRef,
64+
defaultProjectFallbackReady: true,
6465
handleNewThread: startThread,
6566
routeDraftId: null,
6667
routeThreadRef: null,

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

Lines changed: 37 additions & 4 deletions
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";
@@ -226,10 +232,30 @@ export function SnapShotCoordinator() {
226232
activeDraftThread,
227233
activeThread,
228234
defaultProjectRef,
235+
defaultProjectFallbackReady,
229236
handleNewThread,
230237
routeDraftId,
231238
routeThreadRef,
232239
} = useHandleNewThread();
240+
const [lastUsedProjectKey, setLastUsedProjectKey] = useLocalStorage(
241+
LAST_USED_PROJECT_STORAGE_KEY,
242+
null,
243+
lastUsedProjectKeySchema,
244+
);
245+
const currentProject = activeThread ?? activeDraftThread;
246+
const currentProjectKey = currentProject
247+
? scopedProjectKey({
248+
environmentId: currentProject.environmentId,
249+
projectId: currentProject.projectId,
250+
})
251+
: null;
252+
const rememberProject = useEffectEvent((projectKey: string) => {
253+
if (projectKey !== lastUsedProjectKey) setLastUsedProjectKey(projectKey);
254+
});
255+
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Persist route changes without overwriting project choices from other tabs.
256+
useEffect(() => {
257+
if (currentProjectKey) rememberProject(currentProjectKey);
258+
}, [currentProjectKey]);
233259
const captureSound = useClientSettings((settings) =>
234260
settings.snapShotPlaySound ? settings.snapShotSound : null,
235261
);
@@ -341,6 +367,7 @@ export function SnapShotCoordinator() {
341367
? resolveExistingSnapShotTarget(capturedTarget, routeThreadRef)
342368
: null;
343369
if (!target) {
370+
if (!defaultProjectFallbackReady) continue;
344371
await dismissSnapShotAnimation(item.id);
345372
reportOnce(
346373
item.id,
@@ -400,6 +427,7 @@ export function SnapShotCoordinator() {
400427
};
401428

402429
const drainPending = useEffectEvent(() => drain());
430+
const hasDefaultProject = defaultProjectRef !== null;
403431
const handleSnapShotEvent = useEffectEvent(
404432
(bridge: DesktopBridge, event: DesktopSnapShotEvent) => {
405433
if (!getClientSettings().snapShotEnabled) return;
@@ -470,10 +498,15 @@ export function SnapShotCoordinator() {
470498
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to SnapShot events from the desktop bridge and drains pending ones while enabled
471499
useEffect(() => {
472500
const bridge = getDesktopSnapShotBridge();
473-
if (!bridge || !enabled) return;
474-
void drainPending();
501+
if (
502+
!bridge ||
503+
!enabled ||
504+
(!defaultProjectFallbackReady && !hasDefaultProject && !lastRouteTarget)
505+
)
506+
return;
507+
void Promise.resolve(drainingRef.current).then(() => drainPending());
475508
return bridge.onSnapShotEvent((event) => handleSnapShotEvent(bridge, event));
476-
}, [enabled]);
509+
}, [enabled, defaultProjectFallbackReady, hasDefaultProject, lastRouteTarget]);
477510

478511
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- attaches window blur, focus and visibilitychange listeners to dismiss or drain SnapShot animations
479512
useEffect(() => {

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

Lines changed: 44 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,
@@ -230,6 +233,7 @@ vi.mock("../state/entities", () => {
230233
useThread: () => null,
231234
};
232235
});
236+
vi.mock("../state/projects", () => ({ defaultProjectFallbackReadyAtom: () => true }));
233237
vi.mock("../state/olderSettledShelf", () => ({ readUnloadedThreadCount: () => 0 }));
234238
vi.mock("../state/presentation", () => ({
235239
environmentSummaries: { connectedEnvironmentIdsAtom: "connected-environment-ids" },
@@ -247,7 +251,7 @@ vi.mock("../uiStateStore", () => ({
247251
}));
248252
vi.mock("./useSettings", () => ({ getClientSettings: () => ({}) }));
249253

250-
import { useNewThreadHandler } from "./useHandleNewThread";
254+
import { resolveDefaultProjectRef, useNewThreadHandler } from "./useHandleNewThread";
251255

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

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

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,26 @@ import { environmentServerConfigsAtom } from "../state/server";
4242
import { resolveThreadRouteTarget } from "../threadRoutes";
4343
import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
4444
import { getClientSettings } from "./useSettings";
45+
import { getLocalStorageItem, useLocalStorage } from "./useLocalStorage";
46+
import * as Schema from "effect/Schema";
47+
import { useAtomValue } from "@effect/atom-react";
48+
import { defaultProjectFallbackReadyAtom } from "../state/projects";
4549
import { useThreadRouteTarget } from "./useThreadRouteTarget";
4650
import { readUnloadedThreadCount } from "../state/olderSettledShelf";
4751
import { resolveProjectDefaultProviderModelSelection } from "../providerInstances";
4852
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
4953

54+
export const LAST_USED_PROJECT_STORAGE_KEY = "t3code:last-used-project:v1";
55+
export const lastUsedProjectKeySchema = Schema.NullOr(Schema.String);
56+
57+
export function readLastUsedProjectKey(): string | null {
58+
try {
59+
return getLocalStorageItem(LAST_USED_PROJECT_STORAGE_KEY, lastUsedProjectKeySchema);
60+
} catch {
61+
return null;
62+
}
63+
}
64+
5065
interface NewThreadWorkspaceOptions {
5166
branch?: string | null;
5267
worktreePath?: string | null;
@@ -426,7 +441,16 @@ export function createNewThreadHandler(router: AnyRouter) {
426441
export function resolveDefaultProjectRef(
427442
projects: ReadonlyArray<EnvironmentProject>,
428443
projectOrder: readonly string[],
444+
lastUsedProjectKey: string | null,
445+
fallbackReady = true,
429446
): ScopedProjectRef | null {
447+
const lastUsed = projects.find(
448+
(project) =>
449+
project.archivedAt == null &&
450+
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)) === lastUsedProjectKey,
451+
);
452+
if (lastUsed) return scopeProjectRef(lastUsed.environmentId, lastUsed.id);
453+
if (!fallbackReady) return null;
430454
const [defaultProject] = orderItemsByPreferredIds({
431455
items: projects.filter((project) => project.archivedAt == null),
432456
preferredIds: projectOrder,
@@ -441,6 +465,14 @@ export function resolveDefaultProjectRef(
441465

442466
export function useHandleNewThread() {
443467
const projectOrder = useUiStateStore((store) => store.projectOrder);
468+
const [lastUsedProjectKey] = useLocalStorage(
469+
LAST_USED_PROJECT_STORAGE_KEY,
470+
null,
471+
lastUsedProjectKeySchema,
472+
);
473+
const defaultProjectFallbackReady = useAtomValue(
474+
defaultProjectFallbackReadyAtom(lastUsedProjectKey),
475+
);
444476
const routeTarget = useThreadRouteTarget();
445477
const routeThreadRef = routeTarget?.kind === "server" ? routeTarget.threadRef : null;
446478
const routeDraftId = routeTarget?.kind === "draft" ? routeTarget.draftId : null;
@@ -455,12 +487,18 @@ export function useHandleNewThread() {
455487
);
456488
const projects = useProjects();
457489
const handleNewThread = useNewThreadHandler();
458-
const defaultProjectRef = resolveDefaultProjectRef(projects, projectOrder);
490+
const defaultProjectRef = resolveDefaultProjectRef(
491+
projects,
492+
projectOrder,
493+
lastUsedProjectKey,
494+
defaultProjectFallbackReady,
495+
);
459496

460497
return {
461498
activeDraftThread,
462499
activeThread,
463500
defaultProjectRef,
501+
defaultProjectFallbackReady,
464502
handleNewThread,
465503
routeDraftId,
466504
routeThreadRef,

‎apps/web/src/shortcuts/chatRouteCommands.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ import { describe, expect, it, vi } from "vite-plus/test";
44

55
import * as commandPalette from "../commandPaletteBus";
66
import * as settings from "../hooks/useSettings";
7+
import * as storage from "../hooks/useLocalStorage";
78
import * as threadActions from "../lib/chatThreadActions";
89
import * as entities from "../state/entities";
10+
import * as projectsState from "../state/projects";
11+
import { Atom } from "effect/reactivity";
912
import type { Project } from "../types";
1013
import { installChatRouteCommands } from "./chatRouteCommands";
1114
import * as dispatcher from "./dispatcher";
@@ -38,6 +41,10 @@ describe("new thread commands", () => {
3841
using _projects = vi
3942
.spyOn(entities, "readProjects")
4043
.mockReturnValue([project("active"), project("idle")].slice(0, scenario.count));
44+
using _ready = vi
45+
.spyOn(projectsState, "defaultProjectFallbackReadyAtom")
46+
.mockReturnValue(Atom.make(true));
47+
using storedProject = vi.spyOn(storage, "getLocalStorageItem").mockReturnValue("local:active");
4148
using openPicker = vi.spyOn(commandPalette, "openCommandPalette").mockImplementation(() => {});
4249
using startLocal = vi.spyOn(threadActions, "startNewThreadFromContext").mockResolvedValue(true);
4350
using register = vi.spyOn(dispatcher, "registerCommands").mockReturnValue(() => {});
@@ -50,6 +57,7 @@ describe("new thread commands", () => {
5057
stopPropagation: vi.fn(),
5158
} as unknown as KeyboardEvent;
5259

60+
storedProject.mockReturnValue("local:idle");
5361
commands[scenario.command]!(event);
5462

5563
if (scenario.picker) {
@@ -58,6 +66,10 @@ describe("new thread commands", () => {
5866
} else {
5967
expect(openPicker).not.toHaveBeenCalled();
6068
expect(startLocal).toHaveBeenCalledOnce();
69+
expect(startLocal.mock.calls[0]![0].defaultProjectRef).toEqual({
70+
environmentId: "local",
71+
projectId: scenario.count === 1 ? "active" : "idle",
72+
});
6173
}
6274
});
6375
});

‎apps/web/src/shortcuts/chatRouteCommands.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import { useComposerDraftStore } from "../composerDraftStore";
88
import { dispatchPreviewAction, type PreviewAction } from "../components/preview/previewActionBus";
99
import { isAppModalPage } from "../components/sidebar/mainAppLocation";
1010
import { shouldCreateNewThreadInCurrentProject } from "../components/Sidebar.logic";
11-
import { createNewThreadHandler, resolveDefaultProjectRef } from "../hooks/useHandleNewThread";
11+
import {
12+
createNewThreadHandler,
13+
readLastUsedProjectKey,
14+
resolveDefaultProjectRef,
15+
} from "../hooks/useHandleNewThread";
1216
import { createScratchProjectActions } from "../hooks/useScratchProject";
1317
import { getClientSettings } from "../hooks/useSettings";
1418
import { startNewThreadFromContext } from "../lib/chatThreadActions";
@@ -17,6 +21,7 @@ import { selectActiveRightPanel, useRightPanelStore } from "../rightPanelStore";
1721
import { appAtomRegistry } from "../rpc/atomRegistry";
1822
import { buildSidebarProjectSnapshots } from "../sidebarProjectGrouping";
1923
import { readProjects, readThreadShell } from "../state/entities";
24+
import { defaultProjectFallbackReadyAtom } from "../state/projects";
2025
import { environmentPresentations } from "../state/presentation";
2126
import { primaryEnvironmentIdAtom } from "../state/primaryEnvironment";
2227
import { readEnvironmentScope } from "../state/session";
@@ -59,6 +64,7 @@ export function installChatRouteCommands(router: AnyRouter): () => void {
5964
: false;
6065
};
6166
const readThreadContext = () => {
67+
const lastUsedProjectKey = readLastUsedProjectKey();
6268
const target = readRouteTarget();
6369
const drafts = useComposerDraftStore.getState();
6470
const activeThread = target?.kind === "server" ? readThreadShell(target.threadRef) : null;
@@ -73,6 +79,8 @@ export function installChatRouteCommands(router: AnyRouter): () => void {
7379
defaultProjectRef: resolveDefaultProjectRef(
7480
readProjects(),
7581
useUiStateStore.getState().projectOrder,
82+
lastUsedProjectKey,
83+
appAtomRegistry.get(defaultProjectFallbackReadyAtom(lastUsedProjectKey)),
7684
),
7785
handleNewThread,
7886
};

‎apps/web/src/state/projects.ts‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import { WS_METHODS } from "@t3tools/contracts";
55

66
import { environmentCatalog } from "../connection/catalog";
77
import { connectionAtomRuntime } from "../connection/runtime";
8-
import { environmentSnapshotAtom } from "./shell";
8+
import { environmentShell, environmentSnapshotAtom, expectsPrimaryEnvironment } from "./shell";
9+
import { parseScopedProjectKey } from "@t3tools/client-runtime/environment";
10+
import { AVAILABLE_CONNECTION_STATE } from "@t3tools/client-runtime/connection";
11+
import { AsyncResult, Atom } from "effect/reactivity";
912
import { serverEnvironment } from "./server";
1013

1114
export const environmentProjects = createEnvironmentProjectAtoms({
@@ -22,3 +25,31 @@ export const projectContentSearch = createEnvironmentRpcQueryAtomFamily(connecti
2225
staleTimeMs: 5_000,
2326
idleTtlMs: 60_000,
2427
});
28+
29+
export const defaultProjectFallbackReadyAtom = Atom.family((projectKey: string | null) =>
30+
Atom.make((get) => {
31+
const remembered = projectKey === null ? null : parseScopedProjectKey(projectKey);
32+
if (!remembered) return true;
33+
const catalog = get(environmentCatalog.catalogValueAtom);
34+
if (!catalog.isReady) return false;
35+
if (
36+
expectsPrimaryEnvironment() &&
37+
!Array.from(catalog.entries.values()).some(
38+
(entry) => entry.target._tag === "PrimaryConnectionTarget",
39+
)
40+
)
41+
return false;
42+
const entry = catalog.entries.get(remembered.environmentId);
43+
if (!entry?.enabled || entry.unsupportedReason !== undefined) return true;
44+
if (get(environmentShell.statusAtom(remembered.environmentId)) === "live") return true;
45+
const connection = AsyncResult.getOrElse(
46+
get(environmentCatalog.stateAtom(remembered.environmentId)),
47+
() => AVAILABLE_CONNECTION_STATE,
48+
);
49+
return (
50+
connection.phase === "offline" ||
51+
connection.phase === "blocked" ||
52+
(connection.phase === "backoff" && connection.attempt > 2)
53+
);
54+
}).pipe(Atom.withLabel(`web-default-project-fallback-ready:${projectKey}`)),
55+
);

0 commit comments

Comments
 (0)