Skip to content

Commit 0b07c22

Browse files
t3dotggclaude
andcommitted
fix(home): Home's folder is never the default project for a new thread
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent f2fe673 commit 0b07c22

3 files changed

Lines changed: 54 additions & 9 deletions

File tree

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import { useAtomValue } from "@effect/atom-react";
2-
import {
3-
scopedProjectKey,
4-
scopeProjectRef,
5-
scopeThreadRef,
6-
} from "@t3tools/client-runtime/environment";
2+
import { scopedProjectKey, scopeThreadRef } from "@t3tools/client-runtime/environment";
73
import { DEFAULT_SERVER_SETTINGS, type ScopedProjectRef, type ThreadId } from "@t3tools/contracts";
84
import { useParams, useRouter } from "@tanstack/react-router";
95
import { useCallback, useMemo } from "react";
@@ -30,7 +26,9 @@ import {
3026
resolveNewThreadModelSelectionOverride,
3127
} from "../lib/chatThreadActions";
3228
import { readT3ProjectFile } from "../lib/t3ProjectFileDefaults";
33-
import { environmentServerConfigsAtom } from "../state/server";
29+
import { environmentServerConfigsAtom, primaryServerConfigAtom } from "../state/server";
30+
import { usePrimaryEnvironmentId } from "../state/environments";
31+
import { defaultNewThreadProjectRef } from "../lib/chatThreadActions";
3432
import { resolveThreadRouteTarget } from "../threadRoutes";
3533
import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
3634
import { useClientSettings } from "./useSettings";
@@ -464,13 +462,19 @@ export function useHandleNewThread() {
464462
});
465463
}, [projectOrder, projects]);
466464
const handleNewThread = useNewThreadHandler();
465+
const primaryEnvironmentId = usePrimaryEnvironmentId();
466+
const homeWorkspaceRoot = useAtomValue(
467+
primaryServerConfigAtom,
468+
(config) => config?.homeWorkspaceRoot ?? null,
469+
);
467470

468471
return {
469472
activeDraftThread,
470473
activeThread,
471-
defaultProjectRef: orderedProjects[0]
472-
? scopeProjectRef(orderedProjects[0].environmentId, orderedProjects[0].id)
473-
: null,
474+
defaultProjectRef: defaultNewThreadProjectRef(orderedProjects, {
475+
primaryEnvironmentId,
476+
homeWorkspaceRoot,
477+
}),
474478
handleNewThread,
475479
routeDraftId,
476480
routeThreadRef,

‎apps/web/src/lib/chatThreadActions.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
} from "@t3tools/contracts";
88
import { describe, expect, it, vi } from "vite-plus/test";
99
import {
10+
defaultNewThreadProjectRef,
1011
resolveThreadActionProjectRef,
1112
hasExplicitComposerModelSelection,
1213
resolveNewDraftStartFromOrigin,
@@ -115,6 +116,20 @@ describe("chatThreadActions", () => {
115116
expect(projectRef).toEqual(scopeProjectRef(ENVIRONMENT_ID, PROJECT_ID));
116117
});
117118

119+
it("never picks Home's folder as the default project", () => {
120+
const home = { environmentId: ENVIRONMENT_ID, id: PROJECT_ID, workspaceRoot: "/data/home" };
121+
const app = {
122+
environmentId: ENVIRONMENT_ID,
123+
id: FALLBACK_PROJECT_ID,
124+
workspaceRoot: "/code/app",
125+
};
126+
const options = { primaryEnvironmentId: ENVIRONMENT_ID, homeWorkspaceRoot: "/data/home" };
127+
expect(defaultNewThreadProjectRef([home, app], options)).toEqual(
128+
scopeProjectRef(ENVIRONMENT_ID, FALLBACK_PROJECT_ID),
129+
);
130+
expect(defaultNewThreadProjectRef([home], options)).toBeNull();
131+
});
132+
118133
it("never starts a new thread in Home's folder from Home", () => {
119134
const projectRef = resolveThreadActionProjectRef(
120135
createContext({

‎apps/web/src/lib/chatThreadActions.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
2+
import { isHomeProject } from "@t3tools/client-runtime/state/projects";
23
import {
34
type EnvironmentId,
45
type ModelSelection,
@@ -70,6 +71,31 @@ export function hasExplicitComposerModelSelection(
7071
);
7172
}
7273

74+
/**
75+
* The project a new thread starts in when nothing else picks one: the first in
76+
* order that is not Home's folder, which belongs to Home alone.
77+
*/
78+
export function defaultNewThreadProjectRef(
79+
projects: ReadonlyArray<{
80+
readonly environmentId: EnvironmentId;
81+
readonly id: ProjectId;
82+
readonly workspaceRoot: string;
83+
}>,
84+
home: {
85+
readonly primaryEnvironmentId: EnvironmentId | null;
86+
readonly homeWorkspaceRoot: string | null;
87+
},
88+
): ScopedProjectRef | null {
89+
const project = projects.find(
90+
(candidate) =>
91+
!(
92+
candidate.environmentId === home.primaryEnvironmentId &&
93+
isHomeProject(candidate, home.homeWorkspaceRoot)
94+
),
95+
);
96+
return project ? scopeProjectRef(project.environmentId, project.id) : null;
97+
}
98+
7399
export function resolveThreadActionProjectRef(
74100
context: ChatThreadActionContext,
75101
): ScopedProjectRef | null {

0 commit comments

Comments
 (0)