Skip to content

Commit 6e4a9d7

Browse files
committed
feat(projects): add last-used worktree base selection
1 parent f4067ed commit 6e4a9d7

21 files changed

Lines changed: 461 additions & 49 deletions

‎apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
type ServerSettingsPatch,
1010
type ThreadEnvMode,
1111
type WorktreeSubmodules,
12+
type WorktreeBaseRef,
1213
PROJECT_SCOPED_SERVER_SETTING_KEYS,
1314
type ProjectScopedServerSettingKey,
1415
} from "@t3tools/contracts";
@@ -281,10 +282,32 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
281282
))}
282283
</SettingsSection>
283284
<SettingsSection title="Worktree base ref">
285+
<ChoiceRow
286+
label="Repository default"
287+
description="Start from the repository's default branch."
288+
selected={
289+
!isMixed("defaultWorktreeBaseRef") &&
290+
uniform("defaultWorktreeBaseRef") === null
291+
}
292+
separated={false}
293+
disabled={disabledFor("defaultWorktreeBaseRef")}
294+
onPress={() => write({ defaultWorktreeBaseRef: null })}
295+
/>
296+
<ChoiceRow
297+
label="Last used"
298+
description="Reuse your last base in this project on this device."
299+
selected={
300+
!isMixed("defaultWorktreeBaseRef") &&
301+
uniform("defaultWorktreeBaseRef") !== null &&
302+
typeof uniform("defaultWorktreeBaseRef") === "object"
303+
}
304+
separated
305+
disabled={disabledFor("defaultWorktreeBaseRef")}
306+
onPress={() => write({ defaultWorktreeBaseRef: { mode: "last-used" } })}
307+
/>
284308
<View className="gap-3 p-4">
285309
<Text className="text-sm text-foreground-muted">
286-
Branch, tag, or commit to start new worktrees from. Leave blank to use the
287-
repository default.
310+
Or enter a specific branch, tag, or commit.
288311
</Text>
289312
<WorktreeBaseRefField
290313
key={JSON.stringify(
@@ -589,7 +612,7 @@ function FanoutSwitchRow(props: {
589612
}
590613

591614
function WorktreeBaseRefField(props: {
592-
readonly value: string | null;
615+
readonly value: WorktreeBaseRef;
593616
readonly mixed: boolean;
594617
readonly disabled: boolean;
595618
readonly onCommit: (value: string | null) => void;
@@ -599,8 +622,8 @@ function WorktreeBaseRefField(props: {
599622
<AppTextInput
600623
accessibilityLabel="Worktree base ref"
601624
className="min-h-11 rounded-xl border-continuous bg-card px-3 text-base text-foreground"
602-
value={draft ?? props.value ?? ""}
603-
placeholder={props.mixed ? "Mixed" : "Repository default"}
625+
value={draft ?? (typeof props.value === "string" ? props.value : "")}
626+
placeholder={props.mixed ? "Mixed" : "Enter a specific ref…"}
604627
autoCapitalize="none"
605628
autoCorrect={false}
606629
returnKeyType="done"

‎apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,16 @@ export function NewTaskBranchPickerRouteScreen() {
365365
const renderBranch = useCallback(
366366
({ item, index }: { readonly item: VcsRef; readonly index: number }) => (
367367
<BranchSelectionRow
368-
badge={branchBadgeLabel({ branch: item, project: flow.selectedProject })}
368+
badge={
369+
[
370+
branchBadgeLabel({ branch: item, project: flow.selectedProject }),
371+
flow.workspaceMode === "worktree" && item.name === flow.lastWorktreeBaseBranch
372+
? "Last used"
373+
: null,
374+
]
375+
.filter(Boolean)
376+
.join(" · ") || null
377+
}
369378
branch={item}
370379
disabled={switchingBranchName !== null}
371380
isFirst={index === 0}
@@ -376,6 +385,8 @@ export function NewTaskBranchPickerRouteScreen() {
376385
),
377386
[
378387
flow.filteredBranches.length,
388+
flow.lastWorktreeBaseBranch,
389+
flow.workspaceMode,
379390
flow.selectedProject,
380391
selectBranch,
381392
selectedBranchName,

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

Lines changed: 94 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import { useAtomSet, useAtomValue } from "@effect/atom-react";
2+
import { AsyncResult } from "effect/unstable/reactivity";
3+
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
14
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
25

36
import type {
@@ -147,6 +150,7 @@ type NewTaskFlowContextValue = {
147150
readonly selectedModelKey: string | null;
148151
readonly workspaceMode: WorkspaceMode;
149152
readonly selectedBranchName: string | null;
153+
readonly lastWorktreeBaseBranch: string | null;
150154
readonly selectedWorktreePath: string | null;
151155
readonly startFromOrigin: boolean;
152156
readonly draftKey: string | null;
@@ -464,6 +468,21 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
464468
const workspaceMode = selectedProjectDraft.workspaceSelection?.mode ?? defaultWorkspaceMode;
465469
const selectedBranchName = selectedProjectDraft.workspaceSelection?.branch ?? null;
466470
const selectedWorktreePath = selectedProjectDraft.workspaceSelection?.worktreePath ?? null;
471+
const preferencesResult = useAtomValue(mobilePreferencesAtom);
472+
const preferencesLoaded = AsyncResult.isSuccess(preferencesResult);
473+
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
474+
const lastWorktreeBaseBranch =
475+
preferencesLoaded && selectedProject
476+
? (preferencesResult.value.lastWorktreeBaseBranchByProject?.[
477+
scopedProjectKey(selectedProject.environmentId, selectedProject.id)
478+
] ?? null)
479+
: null;
480+
const configuredBaseRef = selectedEnvironmentServerConfig
481+
? projectSettings.settings.defaultWorktreeBaseRef
482+
: undefined;
483+
const rememberedBranch =
484+
configuredBaseRef && typeof configuredBaseRef === "object" ? lastWorktreeBaseBranch : null;
485+
467486
// Keep the user's explicit choice separate from the resolved display value:
468487
// only the explicit flag is ever written back to the draft, so the resolved
469488
// value keeps tracking the server setting when the config loads late.
@@ -650,6 +669,50 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
650669
const hasMoreBranches =
651670
branchState.data?.nextCursor !== null && branchState.data?.nextCursor !== undefined;
652671
const allBranchRefs = branchState.refs;
672+
const needsWorktreeBase =
673+
workspaceMode === "worktree" && selectedBranchName === null && selectedWorktreePath === null;
674+
const baseBranchesQuery = useEnvironmentQuery(
675+
needsWorktreeBase && selectedProject?.workspaceRoot
676+
? vcsEnvironment.listRefs({
677+
environmentId: selectedProject.environmentId,
678+
input: { cwd: selectedProject.workspaceRoot, limit: 100 },
679+
})
680+
: null,
681+
);
682+
const rememberedBranchState = usePaginatedBranches({
683+
environmentId: selectedProject?.environmentId ?? null,
684+
cwd: needsWorktreeBase && rememberedBranch ? selectedProject?.workspaceRoot || null : null,
685+
query: rememberedBranch?.slice(0, 256) ?? null,
686+
includeMatchingRemoteRefs: true,
687+
});
688+
const rememberedRef = rememberedBranchState.refs.find((ref) => ref.name === rememberedBranch);
689+
const hasMoreRememberedRefs = rememberedBranchState.data?.nextCursor != null;
690+
const loadMoreRememberedRefs = rememberedBranchState.loadNext;
691+
useEffect(() => {
692+
if (
693+
needsWorktreeBase &&
694+
rememberedBranch &&
695+
!rememberedRef &&
696+
hasMoreRememberedRefs &&
697+
!rememberedBranchState.isPending &&
698+
!rememberedBranchState.error
699+
)
700+
loadMoreRememberedRefs();
701+
}, [
702+
needsWorktreeBase,
703+
rememberedBranch,
704+
rememberedRef,
705+
hasMoreRememberedRefs,
706+
rememberedBranchState.isPending,
707+
rememberedBranchState.error,
708+
loadMoreRememberedRefs,
709+
]);
710+
const rememberedBranchPending =
711+
rememberedBranch !== null &&
712+
!rememberedRef &&
713+
!rememberedBranchState.error &&
714+
(rememberedBranchState.data === null || hasMoreRememberedRefs);
715+
653716
const availableBranches = useMemo(
654717
() =>
655718
pipe(
@@ -819,6 +882,16 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
819882
if (!selectedProject || !selectedProjectDraftKey) {
820883
return;
821884
}
885+
if (workspaceMode === "worktree") {
886+
savePreferences({
887+
transform: (current) => ({
888+
lastWorktreeBaseBranchByProject: {
889+
...current.lastWorktreeBaseBranchByProject,
890+
[scopedProjectKey(selectedProject.environmentId, selectedProject.id)]: branch.name,
891+
},
892+
}),
893+
});
894+
}
822895
pendingLocalBranchSyncDraftKeysRef.current.delete(selectedProjectDraftKey);
823896
updateComposerDraftSettings(selectedProjectDraftKey, {
824897
workspaceSelection: {
@@ -833,7 +906,13 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
833906
},
834907
});
835908
},
836-
[draftStartFromOrigin, selectedProject, selectedProjectDraftKey, workspaceMode],
909+
[
910+
draftStartFromOrigin,
911+
selectedProject,
912+
selectedProjectDraftKey,
913+
workspaceMode,
914+
savePreferences,
915+
],
837916
);
838917

839918
const setStartFromOrigin = useCallback(
@@ -867,6 +946,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
867946
if (
868947
!selectedProjectDraftKey ||
869948
!defaultWorkspaceModeSettled ||
949+
!preferencesLoaded ||
950+
baseBranchesQuery.data === null ||
951+
rememberedBranchPending ||
870952
workspaceMode !== "worktree" ||
871953
selectedBranchName !== null
872954
) {
@@ -882,11 +964,10 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
882964
// The default may only exist as origin/<default> (isRemote), which
883965
// availableBranches filters out — search the unfiltered refs for it.
884966
const preferredBranch = resolveDefaultWorktreeBaseRef({
885-
configuredRef: selectedEnvironmentServerConfig
886-
? projectSettings.settings.defaultWorktreeBaseRef
887-
: undefined,
888-
refs: allBranchRefs,
889-
currentBranch: availableBranches.find((branch) => branch.current)?.name ?? null,
967+
configuredRef: configuredBaseRef,
968+
rememberedRef: rememberedRef?.name ?? null,
969+
refs: baseBranchesQuery.data.refs,
970+
currentBranch: baseBranchesQuery.data.refs.find((branch) => branch.current)?.name ?? null,
890971
});
891972
if (preferredBranch) {
892973
updateComposerDraftSettings(selectedProjectDraftKey, {
@@ -899,13 +980,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
899980
});
900981
}
901982
}, [
902-
allBranchRefs,
903-
availableBranches,
983+
baseBranchesQuery.data,
984+
preferencesLoaded,
985+
rememberedBranchPending,
986+
rememberedRef,
987+
configuredBaseRef,
904988
defaultWorkspaceModeSettled,
905989
draftStartFromOrigin,
906-
projectSettings.settings.defaultWorktreeBaseRef,
907990
selectedBranchName,
908-
selectedEnvironmentServerConfig,
909991
selectedProjectDraftKey,
910992
workspaceMode,
911993
]);
@@ -1167,6 +1249,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
11671249
selectedModelKey,
11681250
workspaceMode,
11691251
selectedBranchName,
1252+
lastWorktreeBaseBranch,
11701253
selectedWorktreePath,
11711254
startFromOrigin,
11721255
draftKey: selectedProjectDraftKey,
@@ -1247,6 +1330,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
12471330
reset,
12481331
runtimeMode,
12491332
selectedBranchName,
1333+
lastWorktreeBaseBranch,
12501334
hasMoreBranches,
12511335
selectedEnvironmentId,
12521336
selectedModel,
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { describe, expect, it } from "@effect/vitest";
2+
import * as Effect from "effect/Effect";
3+
import * as Option from "effect/Option";
4+
import { vi } from "vite-plus/test";
5+
6+
vi.mock("expo-secure-store", () => ({}));
7+
vi.mock("react-native", () => ({ Platform: { OS: "ios" } }));
8+
9+
import { MobileDatabase, type StoredPreferencesJson } from "./mobile-database";
10+
import { make } from "./mobile-preferences";
11+
import { MobileSecureStorage } from "./mobile-secure-storage";
12+
13+
describe("remembered worktree bases", () => {
14+
it.effect("preserves project selections after reloading preferences and unrelated updates", () =>
15+
Effect.gen(function* () {
16+
let stored: StoredPreferencesJson | null = null;
17+
const database = MobileDatabase.of({
18+
listCache: () => Effect.succeed([]),
19+
loadCache: () => Effect.succeed(Option.none()),
20+
saveCache: () => Effect.void,
21+
removeCache: () => Effect.void,
22+
clearCacheKind: () => Effect.void,
23+
clearEnvironmentCache: () => Effect.void,
24+
clearAllCaches: Effect.void,
25+
inspectCaches: Effect.succeed([]),
26+
loadPreferencesJson: Effect.sync(() => Option.fromNullishOr(stored)),
27+
savePreferencesJson: (payload, updatedAt) =>
28+
Effect.sync(() => {
29+
stored = { payload, updatedAt };
30+
}),
31+
});
32+
const createStore = make().pipe(
33+
Effect.provideService(MobileDatabase, database),
34+
Effect.provideService(MobileSecureStorage, {
35+
getItem: () => Effect.succeed(null),
36+
setItem: () => Effect.void,
37+
removeItem: () => Effect.void,
38+
}),
39+
);
40+
const first = yield* createStore;
41+
yield* first.savePatch({
42+
lastWorktreeBaseBranchByProject: { "env-a:project-a": "dev", "env-b:project-a": "release" },
43+
});
44+
const restarted = yield* createStore;
45+
yield* restarted.savePatch({ baseFontSize: 18 });
46+
expect((yield* restarted.load).lastWorktreeBaseBranchByProject).toEqual({
47+
"env-a:project-a": "dev",
48+
"env-b:project-a": "release",
49+
});
50+
}),
51+
);
52+
});

‎apps/mobile/src/persistence/mobile-preferences.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const PREFERENCES_KEY = "t3code.preferences";
1616
const PREFERENCES_FALLBACK_KEY = "t3code.preferences.fallback";
1717

1818
export interface Preferences {
19+
readonly lastWorktreeBaseBranchByProject?: Readonly<Record<string, string>>;
1920
readonly liveActivitiesEnabled?: boolean;
2021
readonly themeId?: MobileThemeId;
2122
readonly lightThemeId?: MobileThemeId;
@@ -84,6 +85,7 @@ export class MobilePreferencesStore extends Context.Service<
8485

8586
function sanitizePreferences(parsed: Preferences): Preferences {
8687
const preferences: {
88+
lastWorktreeBaseBranchByProject?: Readonly<Record<string, string>>;
8789
liveActivitiesEnabled?: boolean;
8890
themeId?: MobileThemeId;
8991
lightThemeId?: MobileThemeId;
@@ -105,6 +107,18 @@ function sanitizePreferences(parsed: Preferences): Preferences {
105107
threadListSnoozedShelfExpanded?: boolean;
106108
} = {};
107109

110+
if (
111+
parsed.lastWorktreeBaseBranchByProject &&
112+
typeof parsed.lastWorktreeBaseBranchByProject === "object" &&
113+
!Array.isArray(parsed.lastWorktreeBaseBranchByProject)
114+
) {
115+
preferences.lastWorktreeBaseBranchByProject = Object.fromEntries(
116+
Object.entries(parsed.lastWorktreeBaseBranchByProject).filter(
117+
([, branch]) => typeof branch === "string" && branch.trim().length > 0,
118+
),
119+
);
120+
}
121+
108122
if (typeof parsed.liveActivitiesEnabled === "boolean") {
109123
preferences.liveActivitiesEnabled = parsed.liveActivitiesEnabled;
110124
}

‎apps/mobile/src/state/queries.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export function usePaginatedBranches(target: VcsRefTarget) {
216216
const query = target.query?.trim() ?? "";
217217
const targetKey =
218218
target.environmentId !== null && target.cwd !== null
219-
? JSON.stringify([target.environmentId, target.cwd, query])
219+
? JSON.stringify([target.environmentId, target.cwd, query, target.includeMatchingRemoteRefs])
220220
: null;
221221
const [pagination, setPagination] = useState<{
222222
readonly targetKey: string | null;
@@ -235,13 +235,14 @@ export function usePaginatedBranches(target: VcsRefTarget) {
235235
input: {
236236
cwd: target.cwd!,
237237
...(query.length > 0 ? { query } : {}),
238+
...(target.includeMatchingRemoteRefs ? { includeMatchingRemoteRefs: true } : {}),
238239
...(cursor === undefined ? {} : { cursor }),
239240
limit: VCS_REF_LIST_LIMIT,
240241
},
241242
}),
242243
)
243244
: [],
244-
[cursors, query, target.cwd, target.environmentId],
245+
[cursors, query, target.cwd, target.environmentId, target.includeMatchingRemoteRefs],
245246
);
246247
const pagesAtom = useMemo(
247248
() =>

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,14 @@ it.layer(NodeServices.layer)("server settings", (it) => {
320320
yield* fileSystem.readFileString(serverConfig.settingsPath),
321321
);
322322
assert.deepEqual(persisted.projectSettingsOverrides, overrides);
323+
const lastUsed = {
324+
[projectId]: { defaultWorktreeBaseRef: { mode: "last-used" as const } },
325+
};
326+
yield* serverSettings.updateSettings({ projectSettingsOverrides: lastUsed });
327+
const remembered = yield* decodeSettingsJson(
328+
yield* fileSystem.readFileString(serverConfig.settingsPath),
329+
);
330+
assert.deepEqual(remembered.projectSettingsOverrides, lastUsed);
323331
const reset = yield* serverSettings.updateSettings({
324332
projectSettingsOverrides: { [projectId]: null },
325333
});

0 commit comments

Comments
 (0)