@@ -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" ;
125128import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation" ;
126129
127130type 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 ;
0 commit comments