@@ -22,7 +22,11 @@ import { useEnvironmentServerConfig, useProjects, useThreadShells } from "../../
2222import type { TurnCommandMetadata } from "../../lib/commandMetadata" ;
2323import type { DraftComposerImageAttachment } from "../../lib/composerImages" ;
2424import type { ModelOption , ProviderGroup } from "../../lib/modelOptions" ;
25- import { buildModelOptions , groupByProvider } from "../../lib/modelOptions" ;
25+ import {
26+ buildModelOptions ,
27+ groupByProvider ,
28+ resolveSelectableModelSelection ,
29+ } from "../../lib/modelOptions" ;
2630import { groupProjectsByRepository } from "../../lib/repositoryGroups" ;
2731import { scopedProjectKey } from "../../lib/scopedEntities" ;
2832import { appAtomRegistry } from "../../state/atom-registry" ;
@@ -347,7 +351,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
347351 const selectedProjectDraft = useComposerDraft ( selectedProjectDraftKey ) ;
348352 const prompt = selectedProjectDraft . text ;
349353 const attachments = selectedProjectDraft . attachments ;
350- const workspaceMode = selectedProjectDraft . workspaceSelection ?. mode ?? "local" ;
354+ // The server's configured default decides the mode until the user picks one
355+ // explicitly — same resolution web uses for new draft threads.
356+ const defaultWorkspaceMode : WorkspaceMode =
357+ selectedEnvironmentServerConfig ?. settings . defaultThreadEnvMode ?? "local" ;
358+ const workspaceMode = selectedProjectDraft . workspaceSelection ?. mode ?? defaultWorkspaceMode ;
351359 const selectedBranchName = selectedProjectDraft . workspaceSelection ?. branch ?? null ;
352360 const selectedWorktreePath = selectedProjectDraft . workspaceSelection ?. worktreePath ?? null ;
353361 // Keep the user's explicit choice separate from the resolved display value:
@@ -361,22 +369,29 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
361369 const runtimeMode = selectedProjectDraft . runtimeMode ?? DEFAULT_RUNTIME_MODE ;
362370 const interactionMode = selectedProjectDraft . interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE ;
363371
372+ // Stored selections (draft and project default) only count while their
373+ // provider is usable on the server; otherwise the server's default model
374+ // wins instead of silently targeting a disabled provider.
375+ const draftModelSelection = resolveSelectableModelSelection (
376+ selectedEnvironmentServerConfig ,
377+ selectedProjectDraft . modelSelection ?? null ,
378+ ) ;
379+ const projectDefaultModelSelection = resolveSelectableModelSelection (
380+ selectedEnvironmentServerConfig ,
381+ selectedProject ?. defaultModelSelection ?? null ,
382+ ) ;
364383 const modelOptions = useMemo (
365384 ( ) =>
366385 buildModelOptions (
367386 selectedEnvironmentServerConfig ,
368- selectedProjectDraft . modelSelection ?? selectedProject ?. defaultModelSelection ?? null ,
387+ draftModelSelection ?? projectDefaultModelSelection ,
369388 ) ,
370- [
371- selectedEnvironmentServerConfig ,
372- selectedProject ?. defaultModelSelection ,
373- selectedProjectDraft . modelSelection ,
374- ] ,
389+ [ selectedEnvironmentServerConfig , draftModelSelection , projectDefaultModelSelection ] ,
375390 ) ;
376391
377392 const selectedModel =
378- selectedProjectDraft . modelSelection ??
379- selectedProject ?. defaultModelSelection ??
393+ draftModelSelection ??
394+ projectDefaultModelSelection ??
380395 modelOptions . find ( ( option ) => option . isDefault ) ?. selection ??
381396 modelOptions [ 0 ] ?. selection ??
382397 null ;
@@ -675,12 +690,20 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
675690 }
676691 const draft = getComposerDraftSnapshot ( selectedProjectDraftKey ) ;
677692 const text = draft . text . trim ( ) ;
678- const draftModelSelection = draft . modelSelection ?? selectedModel ;
693+ // Same availability gate the composer display applies: a stored
694+ // selection targeting a disabled provider must not ride into the queue.
695+ const draftModelSelection =
696+ resolveSelectableModelSelection (
697+ selectedEnvironmentServerConfig ,
698+ draft . modelSelection ?? null ,
699+ ) ?? selectedModel ;
679700 if ( text . length === 0 || ! draftModelSelection ) {
680701 return null ;
681702 }
682703 const workspaceSelection = draft . workspaceSelection ;
683- const mode = workspaceSelection ?. mode ?? "local" ;
704+ // Fall back to the resolved mode (server default) so queued tasks drain
705+ // with the same mode the composer displayed.
706+ const mode = workspaceSelection ?. mode ?? workspaceMode ;
684707 // When the selection is the stand-in built from the queued snapshot,
685708 // persist the original (possibly absent) snapshot values — the
686709 // stand-in's placeholder title/workspaceRoot must never be written back
@@ -722,10 +745,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
722745 [
723746 editingPendingProject ,
724747 editingPendingTask ,
748+ selectedEnvironmentServerConfig ,
725749 selectedModel ,
726750 selectedProject ,
727751 selectedProjectDraftKey ,
728752 startFromOrigin ,
753+ workspaceMode ,
729754 ] ,
730755 ) ;
731756
0 commit comments