Skip to content

Commit 9f640c8

Browse files
refactor(mobile): pending drafts show the project's default branch
A draft that never picked a mode showed no branch in the home pending list; main showed the default base once the draft had been opened in a worktree-default project. The provider's default-mode derivation (server settings, t3.json, file access, whether the project has threads) moves into useNewTaskProjectDefaults, and resolveNewTaskDraftWorkspace composes selection, default mode and branch fill. The new-task flow, its send path and each pending draft row resolve through both, reading shared per-environment and per-project atoms, so the row shows what the flow would send. A local default still names no branch, as on main. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 8aac87d commit 9f640c8

6 files changed

Lines changed: 208 additions & 112 deletions

File tree

‎apps/mobile/src/features/threads/new-task-context-presentation.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,31 @@ export function fillNewTaskWorkspaceBranch(input: {
151151
? selection
152152
: { ...selection, branch: local.branch, worktreePath: local.worktreePath };
153153
}
154+
155+
/**
156+
* The workspace a new-task draft starts in: its own selection, else the
157+
* project's default mode, with the branch filled in as above. The new-task
158+
* flow, its send path and the home pending-drafts list all resolve through
159+
* this, so what each shows is what is sent.
160+
*/
161+
export function resolveNewTaskDraftWorkspace(input: {
162+
readonly selection: ComposerDraftWorkspaceSelection | undefined;
163+
readonly canChooseWorkspace: boolean;
164+
readonly defaultMode: WorkspaceMode;
165+
readonly defaultModeSettled: boolean;
166+
readonly isGitRepo: boolean;
167+
readonly branches: Parameters<typeof fillNewTaskWorkspaceBranch>[0]["branches"];
168+
readonly projectCwd: string | null;
169+
}): ComposerDraftWorkspaceSelection {
170+
const selection = input.canChooseWorkspace ? input.selection : undefined;
171+
return fillNewTaskWorkspaceBranch({
172+
selection: resolveNewTaskWorkspaceSelection({
173+
selection,
174+
fallback: { mode: input.defaultMode, branch: null, worktreePath: null },
175+
isGitRepo: input.isGitRepo,
176+
}),
177+
branches: input.branches,
178+
projectCwd: input.projectCwd,
179+
worktreeDefaultSettled: selection?.mode !== undefined || input.defaultModeSettled,
180+
});
181+
}

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

Lines changed: 14 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import { ActiveNewTaskContext } from "../../state/active-new-task";
22
import * 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";
63
import React, { useCallback, useEffect, useRef, useState } from "react";
74

85
import type {
96
EnvironmentId,
107
ModelSelection,
11-
ProjectReadFileResult,
128
ProviderInteractionMode,
139
ProviderOptionSelection,
1410
RuntimeMode,
@@ -17,24 +13,15 @@ import type {
1713
import {
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";
2620
import { threadContextsOutsideEnvironment } from "@t3tools/shared/composerContextReferences";
27-
import { resolveNewThreadEnvMode, resolveProjectSettings } from "@t3tools/shared/projectSettings";
28-
import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile";
2921
import * as Arr from "effect/Array";
3022
import { 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";
3825
import type { TurnCommandMetadata } from "../../lib/commandMetadata";
3926
import type { DraftComposerAttachment } from "../../lib/composerImages";
4027
import 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";
8874
import { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
8975
import { type VcsRef } from "@t3tools/client-runtime/state/vcs";
9076
import {
@@ -99,14 +85,13 @@ import {
9985
} from "../../state/legacy-plan-mode";
10086
import { useLegacyPlanModeState } from "./use-legacy-plan-mode-enabled";
10187
import {
102-
fillNewTaskWorkspaceBranch,
88+
resolveNewTaskDraftWorkspace,
10389
resolveNewTaskBranchWorktreePath,
10490
resolveNewTaskLocalWorkspaceSelection,
105-
resolveNewTaskWorkspaceSelection,
10691
} from "./new-task-context-presentation";
10792
import { resolveEnvironmentProjectMatch } from "./new-task-project-selection";
93+
import { useNewTaskProjectDefaults } from "./use-new-task-project-defaults";
10894
import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
109-
import { useOlderSettledCount } from "../../state/olderSettledShelf";
11095

11196
type 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;

‎apps/mobile/src/features/threads/thread-list-v2-items.tsx‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import {
5050
resolvePendingDraftBranch,
5151
} from "../../state/pending-new-tasks-model";
5252
import { useBranches } from "../../state/queries";
53+
import { useNewTaskProjectDefaults } from "./use-new-task-project-defaults";
5354
import {
5455
resolveThreadPrBadgeAction,
5556
type ThreadPrPresentation,
@@ -385,13 +386,23 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
385386
);
386387
const projectTitle = props.projectTitle ?? props.project?.title ?? pendingTask.projectTitle ?? "";
387388
const projectCwd = props.project?.workspaceRoot || null;
389+
// Drafts only; the reads are shared per-project atoms, and queued rows skip them.
390+
const projectDefaults = useNewTaskProjectDefaults(isDraft ? props.project : null);
391+
const draftDefaults = {
392+
canChooseWorkspace: !projectDefaults.isScratch,
393+
defaultMode: projectDefaults.defaultWorkspaceMode,
394+
defaultModeSettled: projectDefaults.defaultWorkspaceModeSettled,
395+
};
388396
const draftBranchRefs = useBranches({
389397
environmentId: pendingTask.environmentId,
390-
cwd: isDraft && pendingDraftBranchNeedsRefs(pendingTask.draft) ? projectCwd : null,
398+
cwd:
399+
isDraft && pendingDraftBranchNeedsRefs(pendingTask.draft, draftDefaults) ? projectCwd : null,
391400
});
392401
const branch = isDraft
393402
? resolvePendingDraftBranch({
394403
draft: pendingTask.draft,
404+
defaults: draftDefaults,
405+
isGitRepo: draftBranchRefs.data?.isRepo ?? true,
395406
branches: draftBranchRefs.data?.refs ?? [],
396407
projectCwd,
397408
})
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
import { resolveFilesystemReadAccess } from "@t3tools/client-runtime/state/filesystem";
2+
import { isScratchProject } from "@t3tools/client-runtime/state/projects";
3+
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
4+
import type { ProjectReadFileResult } from "@t3tools/contracts";
5+
import { DEFAULT_SERVER_SETTINGS, T3_PROJECT_FILE_NAME } from "@t3tools/contracts";
6+
import { resolveNewThreadEnvMode, resolveProjectSettings } from "@t3tools/shared/projectSettings";
7+
import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile";
8+
9+
import { useEnvironmentServerConfig, useThreadShells } from "../../state/entities";
10+
import { useOlderSettledCount } from "../../state/olderSettledShelf";
11+
import { useEnvironmentPresentation } from "../../state/presentation";
12+
import { projectEnvironment } from "../../state/projects";
13+
import { useEnvironmentQuery } from "../../state/query";
14+
import { environmentSession } from "../../state/session";
15+
16+
/**
17+
* A project's new-task defaults: server settings merged with its t3.json. The
18+
* new-task flow and the home pending-drafts list both read the default
19+
* workspace mode here, so a draft that never picked one shows what it sends.
20+
* Every read is a shared per-environment or per-project atom.
21+
*/
22+
export function useNewTaskProjectDefaults(project: EnvironmentProject | null) {
23+
const serverConfig = useEnvironmentServerConfig(project?.environmentId ?? null);
24+
const threads = useThreadShells();
25+
const isScratch =
26+
project !== null && isScratchProject(project, serverConfig?.scratchWorkspaceRoot);
27+
const hasWorkspace = project !== null && project.workspaceRoot !== "";
28+
const fileAccessSession = useEnvironmentQuery(
29+
hasWorkspace ? environmentSession.sessionStateAtom(project.environmentId) : null,
30+
);
31+
const fileEnvironment = useEnvironmentPresentation(project?.environmentId ?? null);
32+
const fileAccess = resolveFilesystemReadAccess({
33+
isCatalogReady: fileEnvironment.isReady,
34+
connection: fileEnvironment.presentation?.connection ?? null,
35+
session: fileAccessSession.data,
36+
sessionError: fileAccessSession.error,
37+
});
38+
const fileAccessPending = hasWorkspace && fileAccess.isPending;
39+
const t3ProjectFileQuery = useEnvironmentQuery(
40+
fileAccess.canReadFiles && hasWorkspace
41+
? projectEnvironment.readFile({
42+
environmentId: project.environmentId,
43+
input: {
44+
cwd: project.workspaceRoot,
45+
relativePath: T3_PROJECT_FILE_NAME,
46+
allowMissing: true,
47+
},
48+
})
49+
: null,
50+
);
51+
const t3ProjectFileData = t3ProjectFileQuery.data as ProjectReadFileResult | null;
52+
const t3ProjectFile =
53+
t3ProjectFileData === null || t3ProjectFileData.exists === false || t3ProjectFileData.truncated
54+
? null
55+
: parseT3ProjectFile(t3ProjectFileData.contents);
56+
const projectSettings = resolveProjectSettings(
57+
serverConfig?.settings ?? DEFAULT_SERVER_SETTINGS,
58+
project?.id ?? null,
59+
project,
60+
t3ProjectFile,
61+
);
62+
const olderSettledCount = useOlderSettledCount(project);
63+
const projectHasThreads =
64+
project !== null &&
65+
(olderSettledCount > 0 ||
66+
threads.some(
67+
(thread) =>
68+
thread.environmentId === project.environmentId && thread.projectId === project.id,
69+
));
70+
const defaultWorkspaceMode = isScratch
71+
? "local"
72+
: resolveNewThreadEnvMode({
73+
projectSettings,
74+
workspaceRoot: project?.workspaceRoot ?? null,
75+
newProjectsRoot: serverConfig?.newProjectsRoot,
76+
projectHasThreads,
77+
});
78+
// While t3.json loads, the environment default is provisional; t3.json may replace it.
79+
const defaultWorkspaceModeSettled =
80+
projectSettings.sources.defaultThreadEnvMode !== "environment" ||
81+
(!t3ProjectFileQuery.isPending && !fileAccessPending);
82+
return {
83+
serverConfig,
84+
isScratch,
85+
projectSettings,
86+
defaultWorkspaceMode,
87+
defaultWorkspaceModeSettled,
88+
};
89+
}

0 commit comments

Comments
 (0)