11import { ActiveNewTaskContext } from "../../state/active-new-task" ;
22import * as Dialog from "../../components/ui/Dialog" ;
3- import { resolveFilesystemReadAccess } from "@t3tools/client-runtime/state/filesystem" ;
4- import { useEnvironmentPresentation } from "../../state/presentation" ;
5- import { environmentSession } from "../../state/session" ;
63import React , { useCallback , useEffect , useRef , useState } from "react" ;
74
85import type {
96 EnvironmentId ,
107 ModelSelection ,
11- ProjectReadFileResult ,
128 ProviderInteractionMode ,
139 ProviderOptionSelection ,
1410 RuntimeMode ,
@@ -17,24 +13,15 @@ import type {
1713import {
1814 CommandId ,
1915 DEFAULT_PROVIDER_INTERACTION_MODE ,
20- DEFAULT_SERVER_SETTINGS ,
2116 MessageId ,
2217 repositoryGroupingKeyOf ,
23- T3_PROJECT_FILE_NAME ,
2418 ThreadId ,
2519} from "@t3tools/contracts" ;
2620import { threadContextsOutsideEnvironment } from "@t3tools/shared/composerContextReferences" ;
27- import { resolveNewThreadEnvMode , resolveProjectSettings } from "@t3tools/shared/projectSettings" ;
28- import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile" ;
2921import * as Arr from "effect/Array" ;
3022import { pipe } from "effect/Function" ;
3123
32- import {
33- useEnvironmentServerConfig ,
34- useProjects ,
35- useServerConfigs ,
36- useThreadShells ,
37- } from "../../state/entities" ;
24+ import { useProjects , useServerConfigs , useThreadShells } from "../../state/entities" ;
3825import type { TurnCommandMetadata } from "../../lib/commandMetadata" ;
3926import type { DraftComposerAttachment } from "../../lib/composerImages" ;
4027import type { ModelOption , ProviderGroup } from "../../lib/modelOptions" ;
@@ -84,7 +71,6 @@ import {
8471 isAtomCommandInterrupted ,
8572 squashAtomCommandFailure ,
8673} from "@t3tools/client-runtime/state/runtime" ;
87- import { isScratchProject } from "@t3tools/client-runtime/state/projects" ;
8874import { EnvironmentProject } from "@t3tools/client-runtime/state/shell" ;
8975import { type VcsRef } from "@t3tools/client-runtime/state/vcs" ;
9076import {
@@ -99,14 +85,13 @@ import {
9985} from "../../state/legacy-plan-mode" ;
10086import { useLegacyPlanModeState } from "./use-legacy-plan-mode-enabled" ;
10187import {
102- fillNewTaskWorkspaceBranch ,
88+ resolveNewTaskDraftWorkspace ,
10389 resolveNewTaskBranchWorktreePath ,
10490 resolveNewTaskLocalWorkspaceSelection ,
105- resolveNewTaskWorkspaceSelection ,
10691} from "./new-task-context-presentation" ;
10792import { resolveEnvironmentProjectMatch } from "./new-task-project-selection" ;
93+ import { useNewTaskProjectDefaults } from "./use-new-task-project-defaults" ;
10894import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation" ;
109- import { useOlderSettledCount } from "../../state/olderSettledShelf" ;
11095
11196type WorkspaceMode = "local" | "worktree" ;
11297
@@ -265,12 +250,9 @@ export function NewTaskFlowProvider(
265250 projectsForEnvironment [ 0 ] ??
266251 null ;
267252
268- const selectedEnvironmentServerConfig = useEnvironmentServerConfig (
269- selectedProject ?. environmentId ?? null ,
270- ) ;
271- const isScratchDraft =
272- selectedProject !== null &&
273- isScratchProject ( selectedProject , selectedEnvironmentServerConfig ?. scratchWorkspaceRoot ) ;
253+ const projectDefaults = useNewTaskProjectDefaults ( selectedProject ) ;
254+ const selectedEnvironmentServerConfig = projectDefaults . serverConfig ;
255+ const isScratchDraft = projectDefaults . isScratch ;
274256 const serverConfigs = useServerConfigs ( ) ;
275257 const { connectedEnvironments } = useRemoteConnectionStatus ( ) ;
276258 const scratchEnvironments = connectedEnvironments . filter (
@@ -378,68 +360,9 @@ export function NewTaskFlowProvider(
378360 } ) ;
379361 const knownIsGitRepo = projectGitStatus . data ?. isRepo ?? projectBranches . data ?. isRepo ?? null ;
380362 const isGitRepo = knownIsGitRepo ?? true ;
381- const fileAccessSession = useEnvironmentQuery (
382- selectedProject !== null && selectedProject . workspaceRoot !== ""
383- ? environmentSession . sessionStateAtom ( selectedProject . environmentId )
384- : null ,
385- ) ;
386- const fileEnvironment = useEnvironmentPresentation ( selectedProject ?. environmentId ?? null ) ;
387- const fileAccess = resolveFilesystemReadAccess ( {
388- isCatalogReady : fileEnvironment . isReady ,
389- connection : fileEnvironment . presentation ?. connection ?? null ,
390- session : fileAccessSession . data ,
391- sessionError : fileAccessSession . error ,
392- } ) ;
393- const { canReadFiles } = fileAccess ;
394- const fileAccessPending =
395- selectedProject !== null && selectedProject . workspaceRoot !== "" && fileAccess . isPending ;
396- const t3ProjectFileQuery = useEnvironmentQuery (
397- canReadFiles && selectedProject !== null && selectedProject . workspaceRoot !== ""
398- ? projectEnvironment . readFile ( {
399- environmentId : selectedProject . environmentId ,
400- input : {
401- cwd : selectedProject . workspaceRoot ,
402- relativePath : T3_PROJECT_FILE_NAME ,
403- allowMissing : true ,
404- } ,
405- } )
406- : null ,
407- ) ;
408- const t3ProjectFileData = t3ProjectFileQuery . data as ProjectReadFileResult | null ;
409- const t3ProjectFile =
410- t3ProjectFileData === null || t3ProjectFileData . exists === false || t3ProjectFileData . truncated
411- ? null
412- : parseT3ProjectFile ( t3ProjectFileData . contents ) ;
413- const projectSettings = resolveProjectSettings (
414- selectedEnvironmentServerConfig ?. settings ?? DEFAULT_SERVER_SETTINGS ,
415- selectedProject ?. id ?? null ,
416- selectedProject ,
417- t3ProjectFile ,
418- ) ;
363+ const projectSettings = projectDefaults . projectSettings ;
419364 const canChooseWorkspace = ! isScratchDraft ;
420- const selectedProjectOlderSettledCount = useOlderSettledCount ( selectedProject ) ;
421- const selectedProjectHasThreads =
422- selectedProject !== null &&
423- ( selectedProjectOlderSettledCount > 0 ||
424- threads . some (
425- ( thread ) =>
426- thread . environmentId === selectedProject . environmentId &&
427- thread . projectId === selectedProject . id ,
428- ) ) ;
429- const defaultWorkspaceMode : WorkspaceMode = canChooseWorkspace
430- ? resolveNewThreadEnvMode ( {
431- projectSettings,
432- workspaceRoot : selectedProject ?. workspaceRoot ?? null ,
433- newProjectsRoot : selectedEnvironmentServerConfig ?. newProjectsRoot ,
434- projectHasThreads : selectedProjectHasThreads ,
435- } )
436- : "local" ;
437- // Do not persist the provisional workspace default while t3.json is loading; it would override
438- // the file's eventual default.
439- const defaultWorkspaceModeSettled =
440- selectedProjectDraft . workspaceSelection ?. mode !== undefined ||
441- projectSettings . sources . defaultThreadEnvMode !== "environment" ||
442- ( ! t3ProjectFileQuery . isPending && ! fileAccessPending ) ;
365+ const defaultWorkspaceMode : WorkspaceMode = projectDefaults . defaultWorkspaceMode ;
443366 const branchState = usePaginatedBranches ( {
444367 environmentId : selectedProject ?. environmentId ?? null ,
445368 cwd : selectedProject ?. workspaceRoot || null ,
@@ -452,15 +375,14 @@ export function NewTaskFlowProvider(
452375 ) ;
453376
454377 const resolveWorkspaceSelection = ( selection : ComposerDraftWorkspaceSelection | undefined ) =>
455- fillNewTaskWorkspaceBranch ( {
456- selection : resolveNewTaskWorkspaceSelection ( {
457- selection : canChooseWorkspace ? selection : undefined ,
458- fallback : { mode : defaultWorkspaceMode , branch : null , worktreePath : null } ,
459- isGitRepo ,
460- } ) ,
378+ resolveNewTaskDraftWorkspace ( {
379+ selection,
380+ canChooseWorkspace,
381+ defaultMode : defaultWorkspaceMode ,
382+ defaultModeSettled : projectDefaults . defaultWorkspaceModeSettled ,
383+ isGitRepo ,
461384 branches : allBranchRefs ,
462385 projectCwd : selectedProject ?. workspaceRoot ?? null ,
463- worktreeDefaultSettled : defaultWorkspaceModeSettled ,
464386 } ) ;
465387 const workspaceSelection = resolveWorkspaceSelection ( selectedProjectDraft . workspaceSelection ) ;
466388 const workspaceMode = workspaceSelection . mode ;
0 commit comments