Skip to content

Commit 2f58144

Browse files
committed
fix(clients): new threads prefer a connected copy of the project
1 parent 5ca7506 commit 2f58144

5 files changed

Lines changed: 124 additions & 15 deletions

File tree

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ import {
121121
resolveNewTaskBranchWorktreePath,
122122
resolveNewTaskLocalWorkspaceSelection,
123123
} from "./new-task-context-presentation";
124-
import { resolveEnvironmentProjectMatch } from "./new-task-project-selection";
124+
import {
125+
resolveEnvironmentProjectMatch,
126+
resolveNewTaskEnvironmentId,
127+
} from "./new-task-project-selection";
125128
import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
126129

127130
type WorkspaceMode = "local" | "worktree";
@@ -268,6 +271,16 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
268271
const projects = useProjects();
269272
const threads = useThreadShells();
270273
const { savedConnectionsById } = useSavedRemoteConnections();
274+
const { connectedEnvironments } = useRemoteConnectionStatus();
275+
const connectedEnvironmentIds = useMemo(
276+
() =>
277+
new Set(
278+
connectedEnvironments
279+
.filter((environment) => environment.connectionState === "connected")
280+
.map((environment) => environment.environmentId),
281+
),
282+
[connectedEnvironments],
283+
);
271284
const groupingSettings = useMobileProjectGroupingSettings();
272285
const { enabled: legacyPlanModeEnabled, loaded: planModePreferenceLoaded } =
273286
useLegacyPlanModeState();
@@ -290,11 +303,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
290303
const [selectedEnvironmentIdOverride, setSelectedEnvironmentId] = useState<EnvironmentId | null>(
291304
null,
292305
);
293-
const selectedEnvironmentId =
294-
selectedEnvironmentIdOverride !== null &&
295-
projects.some((project) => project.environmentId === selectedEnvironmentIdOverride)
296-
? selectedEnvironmentIdOverride
297-
: (projects[0]?.environmentId ?? null);
306+
const selectedEnvironmentId = resolveNewTaskEnvironmentId(
307+
projects,
308+
selectedEnvironmentIdOverride,
309+
connectedEnvironmentIds,
310+
);
298311
const [manualProjectRef, setManualProjectRef] = useState<ScopedProjectRef | null>(null);
299312
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
300313
// The new-task draft the composer is bound to. Null until a project is
@@ -385,7 +398,6 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
385398
selectedProject !== null &&
386399
isScratchProject(selectedProject, selectedEnvironmentServerConfig?.scratchWorkspaceRoot);
387400
const serverConfigs = useServerConfigs();
388-
const { connectedEnvironments } = useRemoteConnectionStatus();
389401
// A thread without a project can move to any connected machine that offers
390402
// one; its Scratch project there is created on the switch if it is missing.
391403
const scratchEnvironments = useMemo(
@@ -489,6 +501,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
489501
projectId: selectedProject.id,
490502
}),
491503
);
504+
setSelectedEnvironmentId(selectedProject.environmentId);
492505
}, [activeDraftKey, editingPendingTask, selectedProject]);
493506
const selectedProjectDraft = useComposerDraft(selectedProjectDraftKey);
494507
const prompt = selectedProjectDraft.text;

‎apps/mobile/src/features/threads/new-task-project-selection.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
getProjectScopeSelectionTarget,
99
resolveDraftProjectSelection,
1010
resolveEnvironmentProjectMatch,
11+
resolveNewTaskEnvironmentId,
1112
} from "./new-task-project-selection";
1213

1314
function makeProject(
@@ -54,6 +55,35 @@ function makeScope(projects: ReadonlyArray<EnvironmentProject>): HomeProjectScop
5455
};
5556
}
5657

58+
describe("resolveNewTaskEnvironmentId", () => {
59+
const mac = EnvironmentId.make("mac");
60+
const server = EnvironmentId.make("server");
61+
const projects = [makeProject("mac-project", mac), makeProject("server-project", server)];
62+
63+
it("defaults to a connected environment that has projects", () => {
64+
expect(resolveNewTaskEnvironmentId(projects, null, new Set([server]))).toBe(server);
65+
expect(
66+
resolveNewTaskEnvironmentId(projects, null, new Set([EnvironmentId.make("empty"), server])),
67+
).toBe(server);
68+
});
69+
70+
it("keeps an explicit offline selection", () => {
71+
expect(resolveNewTaskEnvironmentId(projects, mac, new Set([server]))).toBe(mac);
72+
});
73+
74+
it("keeps project order when several or no environments are connected", () => {
75+
expect(resolveNewTaskEnvironmentId(projects, null, new Set([server, mac]))).toBe(mac);
76+
expect(resolveNewTaskEnvironmentId(projects, null, new Set())).toBe(mac);
77+
});
78+
79+
it("falls back when the selected environment has no projects", () => {
80+
expect(
81+
resolveNewTaskEnvironmentId(projects, EnvironmentId.make("missing"), new Set([server])),
82+
).toBe(server);
83+
expect(resolveNewTaskEnvironmentId([], null, new Set([server]))).toBeNull();
84+
});
85+
});
86+
5787
describe("getProjectScopeSelectionTarget", () => {
5888
it("keeps the current environment when it hosts the selected logical project", () => {
5989
const projects = [makeProject("t3code-mac", "mac"), makeProject("t3code-server", "server")];

‎apps/mobile/src/features/threads/new-task-project-selection.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ type DraftProjectSelectionResolution =
99
| { readonly kind: "select"; readonly project: EnvironmentProject }
1010
| { readonly kind: "pick" };
1111

12+
export function resolveNewTaskEnvironmentId(
13+
projects: ReadonlyArray<Pick<EnvironmentProject, "environmentId">>,
14+
selectedEnvironmentId: EnvironmentId | null,
15+
connectedEnvironmentIds: ReadonlySet<EnvironmentId>,
16+
): EnvironmentId | null {
17+
if (
18+
selectedEnvironmentId !== null &&
19+
projects.some((project) => project.environmentId === selectedEnvironmentId)
20+
) {
21+
return selectedEnvironmentId;
22+
}
23+
return (
24+
projects.find((project) => connectedEnvironmentIds.has(project.environmentId))?.environmentId ??
25+
projects[0]?.environmentId ??
26+
null
27+
);
28+
}
29+
1230
export function getProjectScopeSelectionTarget(
1331
scope: HomeProjectScope,
1432
preferredEnvironmentId: EnvironmentId | null,

‎packages/client-runtime/src/state/newThreadProjectRef.test.ts‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe("new thread project environment", () => {
9292
);
9393

9494
it.each([{}, { defaultEnvironmentId: null }])(
95-
"preserves an offline context for Automatic %j",
95+
"prefers a connected copy over an offline context for Automatic %j",
9696
(override) => {
9797
expect(
9898
resolveNewThreadProjectRef({
@@ -102,12 +102,63 @@ describe("new thread project environment", () => {
102102
connectedEnvironmentIds: new Set([mac.environmentId]),
103103
}),
104104
).toEqual({
105-
projectRef: padRef,
105+
projectRef: macRef,
106106
environmentSelection: "auto",
107107
});
108108
},
109109
);
110110

111+
it("keeps a manual offline pick ahead of connected copies", () => {
112+
expect(
113+
resolveNewThreadProjectRef({
114+
...input,
115+
manualProjectRef: padRef,
116+
connectedEnvironmentIds: new Set([mac.environmentId]),
117+
}),
118+
).toEqual({ projectRef: padRef, environmentSelection: "manual" });
119+
});
120+
121+
it("uses the first connected copy when context and primary are offline", () => {
122+
const server = { environmentId: EnvironmentId.make("server"), id: ProjectId.make("server") };
123+
expect(
124+
resolveNewThreadProjectRef({
125+
...input,
126+
settingsByEnvironment: settings(),
127+
members: [mac, pad, server],
128+
contextProjectRef: padRef,
129+
connectedEnvironmentIds: new Set([server.environmentId]),
130+
}),
131+
).toEqual({
132+
projectRef: { environmentId: server.environmentId, projectId: server.id },
133+
environmentSelection: "auto",
134+
});
135+
});
136+
137+
it("keeps context, primary, then member order when nothing is connected", () => {
138+
const offline = {
139+
...input,
140+
settingsByEnvironment: settings(),
141+
connectedEnvironmentIds: new Set<EnvironmentId>(),
142+
};
143+
expect(
144+
resolveNewThreadProjectRef({ ...offline, contextProjectRef: padRef }).projectRef,
145+
).toEqual(padRef);
146+
expect(
147+
resolveNewThreadProjectRef({
148+
...offline,
149+
contextProjectRef: null,
150+
primaryEnvironmentId: pad.environmentId,
151+
}).projectRef,
152+
).toEqual(padRef);
153+
expect(
154+
resolveNewThreadProjectRef({
155+
...offline,
156+
contextProjectRef: null,
157+
primaryEnvironmentId: null,
158+
}).projectRef,
159+
).toEqual(macRef);
160+
});
161+
111162
it("falls back to the context machine for another project, then primary, then first member", () => {
112163
const automatic = { ...input, settingsByEnvironment: settings() };
113164
expect(

‎packages/client-runtime/src/state/projectGrouping.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,9 @@ export function resolveNewThreadProjectRef(input: {
381381
(member) => member.environmentId === input.primaryEnvironmentId,
382382
);
383383
const connectedFallbackMember =
384-
defaultEnvironmentId != null
385-
? ([contextMember, primaryMember].find(
386-
(member) => member && input.connectedEnvironmentIds.has(member.environmentId),
387-
) ??
388-
input.members.find((member) => input.connectedEnvironmentIds.has(member.environmentId)))
389-
: undefined;
384+
[contextMember, primaryMember].find(
385+
(member) => member && input.connectedEnvironmentIds.has(member.environmentId),
386+
) ?? input.members.find((member) => input.connectedEnvironmentIds.has(member.environmentId));
390387
const fallbackMember =
391388
connectedFallbackMember ?? contextMember ?? primaryMember ?? input.members[0];
392389
return {

0 commit comments

Comments
 (0)