The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 20:45 UTC
fix(mobile): use current checkout for non-git projects (#21404)
maria committed
Oct 21, 2026 at 00:03 UTC
4db2533f5575b58bd09d807c4241261a714ea3ea
7 files changed
+127
-29
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+16
-5
@@ -134,6 +134,7 @@ import { resolveDraftProjectSelection } from "./new-task-project-selection";
134
import {
135
resolveNewTaskBranchLabel,
136
resolveNewTaskWorkspaceLabel,
137
+ resolveNewTaskWorkspaceSelection,
138
} from "./new-task-context-presentation";
139
import { useIncomingShare } from "../sharing/IncomingShareProvider";
140
import { selectIncomingShareAttachmentsForServer } from "../sharing/incoming-share-model";
@@ -1190,8 +1191,17 @@ export function NewTaskDraftScreen(props: {
1191
draft.modelSelection ?? null,
1192
selectedProject.id,
1193
) ?? flow.selectedModel;
1193
- const workspaceMode = draft.workspaceSelection?.mode ?? flow.workspaceMode;
1194
- const selectedBranchName = draft.workspaceSelection?.branch ?? flow.selectedBranchName;
1194
+ const workspaceSelection = resolveNewTaskWorkspaceSelection({
1195
+ selection: draft.workspaceSelection,
1196
+ fallback: {
1197
+ mode: flow.workspaceMode,
1198
+ branch: flow.selectedBranchName,
1199
+ worktreePath: flow.selectedWorktreePath,
1200
+ },
1201
+ isGitRepo: flow.isGitRepo,
1202
+ });
1203
+ const workspaceMode = workspaceSelection.mode;
1204
+ const selectedBranchName = workspaceSelection.branch;
1205
const initialMessageText = draft.text.trim();
1206
1207
if (
@@ -1366,7 +1376,8 @@ export function NewTaskDraftScreen(props: {
1376
!flow.submitting &&
1377
pendingPastedTextAttachmentCount === 0 &&
1378
!voiceInput.blocksSubmission &&
1369
- !(flow.workspaceMode === "worktree" && !flow.selectedBranchName);
1379
+ // Until the repository check answers, a saved worktree selection may belong to a non-git folder.
1380
+ !(flow.workspaceMode === "worktree" && (!flow.selectedBranchName || !flow.isGitRepoKnown));
1381
const openDraftDocument = (attachment: ComposerDocumentAttachment) => {
1382
// A draft attachment lives only in the draft. Without its key the screen would fall through
1383
// to a remote lookup for bytes the server has never seen.
@@ -1553,7 +1564,7 @@ export function NewTaskDraftScreen(props: {
1564
<ComposerInlineControl
1565
accessibilityHint={`Switches to ${flow.workspaceMode === "local" ? "a new worktree" : "the current checkout"}`}
1566
accessibilityLabel={workspaceLabel}
1556
- disabled={isComposerInteractionLocked || voiceInput.isBusy}
1567
+ disabled={isComposerInteractionLocked || voiceInput.isBusy || !flow.isGitRepo}
1568
renderIcon={(size) => (
1569
<NewTaskWorkspaceIcon
1570
workspaceMode={flow.workspaceMode}
@@ -1570,7 +1581,7 @@ export function NewTaskDraftScreen(props: {
1581
<ComposerInlineControl
1582
accessibilityLabel={`${flow.workspaceMode === "worktree" ? "Base branch" : "Branch"}: ${selectedBranchLabel}`}
1583
chevronDirection="right"
1573
- disabled={isComposerInteractionLocked}
1584
+ disabled={isComposerInteractionLocked || !flow.isGitRepo}
1585
icon="arrow.triangle.branch"
1586
label={showBranchLoading ? "Loading branches…" : selectedBranchLabel}
1587
maxWidth={190}
apps/mobile/src/features/threads/new-task-context-presentation.test.ts
+40
@@ -5,8 +5,48 @@ import {
5
resolveNewTaskBranchWorktreePath,
6
resolveNewTaskBranchLabel,
7
resolveNewTaskLocalWorkspaceSelection,
8
+ resolveNewTaskWorkspaceSelection,
9
} from "./new-task-context-presentation";
10
11
+describe("resolveNewTaskWorkspaceSelection", () => {
12
+ const fallback = { mode: "worktree", branch: null, worktreePath: null } as const;
13
+
14
+ it("falls back to the current checkout when a non-git project defaults to worktree", () => {
15
+ expect(
16
+ resolveNewTaskWorkspaceSelection({ selection: undefined, fallback, isGitRepo: false }),
17
+ ).toEqual({ mode: "local", branch: null, worktreePath: null });
18
+ });
19
+
20
+ it.each(["local", "worktree"] as const)(
21
+ "clears stale %s selections for non-git projects",
22
+ (mode) => {
23
+ expect(
24
+ resolveNewTaskWorkspaceSelection({
25
+ selection: {
26
+ mode,
27
+ branch: "main",
28
+ worktreePath: "/old-worktree",
29
+ startFromOrigin: true,
30
+ pullRequestReference: "https://github.com/acme/repo/pull/123",
31
+ },
32
+ fallback,
33
+ isGitRepo: false,
34
+ }),
35
+ ).toEqual({ mode: "local", branch: null, worktreePath: null });
36
+ },
37
+ );
38
+
39
+ it("preserves the selection and defaults for git projects", () => {
40
+ const selection = { mode: "local", branch: "feature", worktreePath: "/worktree" } as const;
41
+ expect(resolveNewTaskWorkspaceSelection({ selection, fallback, isGitRepo: true })).toBe(
42
+ selection,
43
+ );
44
+ expect(
45
+ resolveNewTaskWorkspaceSelection({ selection: undefined, fallback, isGitRepo: true }),
46
+ ).toBe(fallback);
47
+ });
48
+});
49
+
50
describe("resolveNewTaskLocalWorkspaceSelection", () => {
51
it("waits for refs instead of carrying a worktree base into Current checkout", () => {
52
expect(
apps/mobile/src/features/threads/new-task-context-presentation.ts
+12
@@ -1,8 +1,20 @@
1
import { sanitizeNewRefName } from "@t3tools/shared/git";
2
import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl";
3
+import { resolveSendEnvMode } from "@t3tools/shared/projectSettings";
4
+import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";
5
6
type WorkspaceMode = "local" | "worktree";
7
8
+export function resolveNewTaskWorkspaceSelection(input: {
9
+ readonly selection: ComposerDraftWorkspaceSelection | undefined;
10
+ readonly fallback: ComposerDraftWorkspaceSelection;
11
+ readonly isGitRepo: boolean;
12
+}): ComposerDraftWorkspaceSelection {
13
+ const selection = input.selection ?? input.fallback;
14
+ const mode = resolveSendEnvMode({ requestedEnvMode: selection.mode, isGitRepo: input.isGitRepo });
15
+ return input.isGitRepo ? selection : { mode, branch: null, worktreePath: null };
16
+}
17
+
18
export function resolveNewTaskWorkspaceLabel(input: {
19
readonly workspaceMode: WorkspaceMode;
20
readonly worktreePath: string | null;
apps/mobile/src/features/threads/new-task-flow-provider.tsx
+37
-18
@@ -79,7 +79,7 @@ import {
79
rememberModelOptions,
80
withRememberedModelOptions,
81
} from "../../state/use-model-option-memory";
82
-import { useDebouncedValue, usePaginatedBranches } from "../../state/queries";
82
+import { useBranches, useDebouncedValue, usePaginatedBranches } from "../../state/queries";
83
import { vcsEnvironment } from "../../state/vcs";
84
import {
85
flattenQueuedThreadMessages,
@@ -119,6 +119,7 @@ import {
119
filterNewTaskBranches,
120
resolveNewTaskBranchWorktreePath,
121
resolveNewTaskLocalWorkspaceSelection,
122
+ resolveNewTaskWorkspaceSelection,
123
} from "./new-task-context-presentation";
124
import { resolveEnvironmentProjectMatch } from "./new-task-project-selection";
125
import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
@@ -169,6 +170,8 @@ type NewTaskFlowContextValue = {
170
readonly selectedProjectKey: string | null;
171
readonly selectedModelKey: string | null;
172
readonly workspaceMode: WorkspaceMode;
173
+ readonly isGitRepo: boolean;
174
+ readonly isGitRepoKnown: boolean;
175
readonly canChooseWorkspace: boolean;
176
readonly selectedBranchName: string | null;
177
readonly selectedWorktreePath: string | null;
@@ -435,6 +438,22 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
438
const selectedProjectDraft = useComposerDraft(selectedProjectDraftKey);
439
const prompt = selectedProjectDraft.text;
440
const attachments = selectedProjectDraft.attachments;
441
+ const projectGitStatus = useEnvironmentQuery(
442
+ selectedProject !== null && selectedProject.workspaceRoot !== ""
443
+ ? vcsEnvironment.status({
444
+ environmentId: selectedProject.environmentId,
445
+ input: { cwd: selectedProject.workspaceRoot },
446
+ })
447
+ : null,
448
+ );
449
+ const currentCheckoutBranchName = projectGitStatus.data?.refName ?? null;
450
+ // The unfiltered ref list also provides repository capability while offline.
451
+ const projectBranches = useBranches({
452
+ environmentId: selectedProject?.environmentId ?? null,
453
+ cwd: selectedProject?.workspaceRoot || null,
454
+ });
455
+ const knownIsGitRepo = projectGitStatus.data?.isRepo ?? projectBranches.data?.isRepo ?? null;
456
+ const isGitRepo = knownIsGitRepo ?? true;
457
const fileAccessSession = useEnvironmentQuery(
458
selectedProject !== null && selectedProject.workspaceRoot !== ""
459
? environmentSession.sessionStateAtom(selectedProject.environmentId)
@@ -497,17 +516,20 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
516
selectedProjectDraft.workspaceSelection?.mode !== undefined ||
517
projectSettings.sources.defaultThreadEnvMode !== "environment" ||
518
(!t3ProjectFileQuery.isPending && !fileAccessPending);
500
- const workspaceMode = canChooseWorkspace
501
- ? (selectedProjectDraft.workspaceSelection?.mode ?? defaultWorkspaceMode)
502
- : "local";
503
- const selectedBranchName = selectedProjectDraft.workspaceSelection?.branch ?? null;
504
- const selectedWorktreePath = selectedProjectDraft.workspaceSelection?.worktreePath ?? null;
519
+ const workspaceSelection = resolveNewTaskWorkspaceSelection({
520
+ selection: canChooseWorkspace ? selectedProjectDraft.workspaceSelection : undefined,
521
+ fallback: { mode: defaultWorkspaceMode, branch: null, worktreePath: null },
522
+ isGitRepo,
523
+ });
524
+ const workspaceMode = workspaceSelection.mode;
525
+ const selectedBranchName = workspaceSelection.branch;
526
+ const selectedWorktreePath = workspaceSelection.worktreePath;
527
// Keep the user's explicit choice separate from the resolved display value:
528
// only the explicit flag is ever written back to the draft, so the resolved
529
// value keeps tracking the server setting when the config loads late.
530
const draftStartFromOrigin = selectedProjectDraft.workspaceSelection?.startFromOrigin;
531
const startFromOrigin =
510
- draftStartFromOrigin ?? projectSettings.settings.newWorktreesStartFromOrigin;
532
+ isGitRepo && (draftStartFromOrigin ?? projectSettings.settings.newWorktreesStartFromOrigin);
533
const defaultRuntimeMode = editingPendingTask
534
? (editingPendingTask.runtimeMode ?? DEFAULT_RUNTIME_MODE)
535
: projectSettings.settings.defaultRuntimeMode;
@@ -662,15 +684,6 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
684
allBranchRefs,
685
Arr.filter((branch) => !branch.isRemote),
686
);
665
- const projectGitStatus = useEnvironmentQuery(
666
- branchTarget.environmentId !== null && branchTarget.cwd !== null
667
- ? vcsEnvironment.status({
668
- environmentId: branchTarget.environmentId,
669
- input: { cwd: branchTarget.cwd },
670
- })
671
- : null,
672
- );
673
- const currentCheckoutBranchName = projectGitStatus.data?.refName ?? null;
687
688
const filteredBranches = filterNewTaskBranches(allBranchRefs, branchQuery);
689
@@ -971,8 +984,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
984
) {
985
return null;
986
}
974
- const workspaceSelection = canChooseWorkspace ? draft.workspaceSelection : undefined;
975
- const mode = workspaceSelection?.mode ?? workspaceMode;
987
+ const workspaceSelection = resolveNewTaskWorkspaceSelection({
988
+ selection: canChooseWorkspace ? draft.workspaceSelection : undefined,
989
+ fallback: { mode: workspaceMode, branch: null, worktreePath: null },
990
+ isGitRepo,
991
+ });
992
+ const mode = workspaceSelection.mode;
993
// When the selection is the stand-in built from the queued snapshot,
994
// persist the original (possibly absent) snapshot values — the
995
// stand-in's placeholder title/workspaceRoot must never be written back
@@ -1131,6 +1148,8 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
1148
selectedProjectKey,
1149
selectedModelKey,
1150
workspaceMode,
1151
+ isGitRepo,
1152
+ isGitRepoKnown: knownIsGitRepo !== null,
1153
canChooseWorkspace,
1154
selectedBranchName,
1155
selectedWorktreePath,
apps/web/src/components/ChatView.logic.ts
+1
-6
@@ -797,12 +797,7 @@ export function collectUserMessageBlobPreviewUrls(message: ChatMessage): string[
797
798
export { readFileAsDataUrl } from "../lib/imageCompression";
799
800
-export function resolveSendEnvMode(input: {
801
- requestedEnvMode: DraftThreadEnvMode;
802
- isGitRepo: boolean;
803
-}): DraftThreadEnvMode {
804
- return input.isGitRepo ? input.requestedEnvMode : "local";
805
-}
800
+export { resolveSendEnvMode } from "@t3tools/shared/projectSettings";
801
802
export function resolveBackgroundDraftWorkspaceOptions(input: {
803
envMode: DraftThreadEnvMode;
packages/shared/src/projectSettings.test.ts
+14
@@ -13,6 +13,7 @@ import {
13
resolveNewThreadEnvMode,
14
resolveProjectFileBackedSetting,
15
resolveProjectSettings,
16
+ resolveSendEnvMode,
17
resolveWorktreeCleanup,
18
withProjectSettingsOverrides,
19
} from "./projectSettings.ts";
@@ -21,6 +22,19 @@ import { applyServerSettingsPatch } from "./serverSettings.ts";
22
const projectId = ProjectId.make("project-a");
23
const otherProjectId = ProjectId.make("project-b");
24
25
+describe("resolveSendEnvMode", () => {
26
+ it.each(["local", "worktree"] as const)(
27
+ "uses local for non-git projects requesting %s",
28
+ (mode) => {
29
+ expect(resolveSendEnvMode({ requestedEnvMode: mode, isGitRepo: false })).toBe("local");
30
+ },
31
+ );
32
+
33
+ it.each(["local", "worktree"] as const)("preserves %s for git repositories", (mode) => {
34
+ expect(resolveSendEnvMode({ requestedEnvMode: mode, isGitRepo: true })).toBe(mode);
35
+ });
36
+});
37
+
38
describe("resolveProjectSettings", () => {
39
it("inherits every scopable key when the project has no overrides", () => {
40
const resolved = resolveProjectSettings(DEFAULT_SERVER_SETTINGS, projectId);
packages/shared/src/projectSettings.ts
+7
@@ -205,6 +205,13 @@ export function resolveNewThreadEnvMode(input: {
205
return isNewProjectFolder ? "local" : configured;
206
}
207
208
+export function resolveSendEnvMode(input: {
209
+ readonly requestedEnvMode: ThreadEnvMode;
210
+ readonly isGitRepo: boolean;
211
+}): ThreadEnvMode {
212
+ return input.isGitRepo ? input.requestedEnvMode : "local";
213
+}
214
+
215
export function withProjectSettingsOverrides(
216
settings: Pick<ServerSettings, "projectSettingsOverrides">,
217
projectId: ProjectId,