diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx index ca77e1e641d7f..1ba9ffe8c74e1 100644 --- a/apps/mobile/src/Stack.tsx +++ b/apps/mobile/src/Stack.tsx @@ -123,6 +123,7 @@ import { ScheduledTaskBranchPickerRouteScreen, ScheduledTaskThreadPickerRouteScreen, } from "./features/settings/ScheduledTaskPickerScreens"; +import { WorktreeBaseBranchPickerRouteScreen } from "./features/settings/WorktreeBaseBranchPickerRouteScreen"; import { SettingsKeyboardRouteScreen } from "./features/settings/SettingsKeyboardRouteScreen"; import { SettingsLegalRouteScreen } from "./features/settings/SettingsLegalRouteScreen"; import { SettingsVoiceRouteScreen } from "./features/settings/SettingsVoiceRouteScreen"; @@ -192,6 +193,7 @@ const ROUTE_TITLES: Readonly> = { SettingsScheduledTaskNew: msg("New scheduled task"), SettingsScheduledTaskEdit: msg("Edit scheduled task"), SettingsScheduledTaskBranch: msg("Base branch"), + SettingsWorktreeBaseBranch: msg("Base branch"), SettingsScheduledTaskThread: msg("Destination"), SettingsClientStorage: msg("Client Storage"), SettingsDiagnostics: msg("Diagnostics"), @@ -382,6 +384,10 @@ const SETTINGS_SCREENS = { screen: ScheduledTaskBranchPickerRouteScreen, options: settingsPage(), }), + SettingsWorktreeBaseBranch: createNativeStackScreen({ + screen: WorktreeBaseBranchPickerRouteScreen, + options: settingsPage(), + }), SettingsScheduledTaskThread: createNativeStackScreen({ screen: ScheduledTaskThreadPickerRouteScreen, options: settingsPage(), diff --git a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx index 61aeef42e84e4..61b7e12308025 100644 --- a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx +++ b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx @@ -126,6 +126,9 @@ vi.mock("./components/BranchNamingSettings", () => ({ return null; }, })); +vi.mock("./components/WorktreeBaseBranchSetting", () => ({ + WorktreeBaseBranchSetting: () => null, +})); vi.mock("./settings-environment-filter", () => ({ useSettingsEnvironmentFilter: () => ({ selectedTargets: mocks.targets, diff --git a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx index c48328d62d66f..d180d0ba9a24c 100644 --- a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx +++ b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx @@ -32,6 +32,7 @@ import { SettingsSwitchRow } from "./components/SettingsSwitchRow"; import { IssueTrackerSection } from "./components/IssueTrackerSection"; import { SourceControlProvidersSection } from "./components/SourceControlProvidersSection"; import { SettingsProjectOverridesSection } from "./components/SettingsProjectOverridesSection"; +import { WorktreeBaseBranchSetting } from "./components/WorktreeBaseBranchSetting"; import { useSettingsEnvironmentFilter } from "./settings-environment-filter"; import { useSettingsWriter } from "./useSettingsWriter"; import { @@ -66,6 +67,7 @@ const PAGE_PROJECT_KEYS: Record + {projectSelected ? ( + navigation.navigate("SettingsWorktreeBaseBranch")} + /> + ) : ( + + )} group.key === selectedProjectKey)?.members ?? []; + const targets = resolveMobileSettingsTargets( + selectedTargets, + members.map((member) => member.project), + ); + const project = + members.find((member) => + targets.some((target) => target.environment.environmentId === member.project.environmentId), + )?.project ?? null; + const writable = useEnvironmentsWithScope(selectedTargets, AuthSettingsWriteScope); + const canWrite = + targets.length > 0 && targets.every((target) => writable.has(target.environment.environmentId)); + const writeSettings = useSettingsWriter(); + const [query, setQuery] = useState(""); + const debouncedQuery = useDebouncedValue(query, 150); + const branches = usePaginatedBranches({ + environmentId: project?.environmentId ?? null, + cwd: project?.workspaceRoot ?? null, + query: debouncedQuery, + }); + const visibleBranches = branches.refs.filter((branch) => + branch.name.toLowerCase().includes(query.trim().toLowerCase()), + ); + const value = uniformMobileSetting(targets, "newWorktreesBaseBranch"); + const select = (newWorktreesBaseBranch: string) => { + void Haptics.selectionAsync(); + void writeSettings( + targets, + planMobileScopedSettingsPatch(targets, true, { newWorktreesBaseBranch }), + ); + navigation.goBack(); + }; + + return ( + select(branch.name)} + defaultOption={{ + title: gt("Repository default"), + selected: value === "", + onSelect: () => select(""), + }} + /> + ); +} diff --git a/apps/mobile/src/features/settings/components/WorktreeBaseBranchSetting.tsx b/apps/mobile/src/features/settings/components/WorktreeBaseBranchSetting.tsx new file mode 100644 index 0000000000000..dc96240d688df --- /dev/null +++ b/apps/mobile/src/features/settings/components/WorktreeBaseBranchSetting.tsx @@ -0,0 +1,53 @@ +import type { ServerSettingsPatch } from "@t3tools/contracts"; +import { useGT } from "gt-react-native"; +import { useEffect, useEffectEvent, useRef } from "react"; +import { View } from "react-native"; + +import { AppText as Text, AppTextInput } from "../../../components/ui/AppText"; + +export function WorktreeBaseBranchSetting(props: { + value: string | null; + disabled: boolean; + onChange: (patch: ServerSettingsPatch) => void; +}) { + const gt = useGT(); + // Save on exit too: Android Back hides the keyboard without ending editing. + const draft = useRef<{ text: string; over: string | null } | null>(null); + const save = () => { + const current = draft.current; + draft.current = null; + // Drop a draft typed over an older saved value: the updated value has already remounted the input. + if (current === null || current.over !== props.value) return; + const value = current.text.trim(); + if (props.value === null || value !== props.value) { + props.onChange({ newWorktreesBaseBranch: value }); + } + }; + const saveOnExit = useEffectEvent(save); + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- saves an unsent base branch draft to server settings when the setting unmounts + useEffect(() => () => saveOnExit(), []); + return ( + + {gt("Base branch")} + + {gt( + "The branch, tag, or commit new worktrees start from, such as dev. Leave empty to use the repository’s default branch.", + )} + + { + draft.current = { text, over: props.value }; + }} + defaultValue={props.value ?? ""} + placeholder={props.value === null ? gt("Mixed") : gt("Repository default")} + editable={!props.disabled} + autoCapitalize="none" + autoCorrect={false} + className="min-h-10 rounded-xl px-3 py-2 text-base text-foreground" + onEndEditing={save} + /> + + ); +} diff --git a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx index 21a16cbf7f232..beea8499f89e2 100644 --- a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx +++ b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx @@ -363,6 +363,11 @@ export function BranchPickerScreen(props: { readonly startFromOrigin: boolean; readonly onChangeStartFromOrigin: (value: boolean) => void; }; + readonly defaultOption?: { + readonly title: string; + readonly selected: boolean; + readonly onSelect: () => void; + }; }) { const gt = useGT(); const m = useMessages(); @@ -405,20 +410,34 @@ export function BranchPickerScreen(props: { /> ); - const branchListHeader = props.worktree ? ( - - - - ) : null; + const branchListHeader = + props.worktree || props.defaultOption ? ( + + {props.worktree ? ( + + ) : null} + {props.defaultOption ? ( + + ) : null} + + ) : null; const branchContent = props.branches.length === 0 ? ( diff --git a/apps/mobile/src/features/threads/new-task-context-presentation.test.ts b/apps/mobile/src/features/threads/new-task-context-presentation.test.ts index 2bb2659dc6d76..c02e6b8b8a1b5 100644 --- a/apps/mobile/src/features/threads/new-task-context-presentation.test.ts +++ b/apps/mobile/src/features/threads/new-task-context-presentation.test.ts @@ -2,6 +2,7 @@ import { describe, expect, it } from "vite-plus/test"; import { fillNewTaskWorkspaceBranch, + resolveWorktreeSwitchBranch, resolveNewTaskBranchLabel, resolveNewTaskBranchWorktreePath, resolveNewTaskLocalWorkspaceSelection, @@ -116,6 +117,7 @@ describe("fillNewTaskWorkspaceBranch", () => { branches, projectCwd: "/repo", worktreeDefaultSettled: true, + worktreeBaseBranch: "", }; it("bases a new worktree on the default branch, even when only the remote has it", () => { @@ -127,6 +129,32 @@ describe("fillNewTaskWorkspaceBranch", () => { ).toEqual({ mode: "worktree", branch: "origin/main", worktreePath: null }); }); + it("bases a new worktree on the configured branch, even when refs have not listed it", () => { + expect( + fillNewTaskWorkspaceBranch({ + ...base, + branches: [], + worktreeBaseBranch: "dev", + selection: { mode: "worktree", branch: null, worktreePath: null }, + }), + ).toEqual({ mode: "worktree", branch: "dev", worktreePath: null }); + }); + + it("keeps a configured base out of local selections", () => { + expect( + fillNewTaskWorkspaceBranch({ + ...base, + worktreeBaseBranch: "dev", + selection: { + mode: "local", + branch: null, + worktreePath: null, + followsCurrentCheckout: true, + }, + }), + ).toMatchObject({ branch: "feature" }); + }); + it("waits for the workspace default to settle before picking a base", () => { const selection = { mode: "worktree", branch: null, worktreePath: null } as const; expect(fillNewTaskWorkspaceBranch({ ...base, selection, worktreeDefaultSettled: false })).toBe( @@ -167,5 +195,28 @@ describe("fillNewTaskWorkspaceBranch", () => { it("keeps an explicit branch", () => { const selection = { mode: "worktree", branch: "release", worktreePath: null } as const; expect(fillNewTaskWorkspaceBranch({ ...base, selection })).toBe(selection); + expect(fillNewTaskWorkspaceBranch({ ...base, worktreeBaseBranch: "dev", selection })).toBe( + selection, + ); + }); +}); + +describe("resolveWorktreeSwitchBranch", () => { + it("starts a new worktree from the configured base, not the checkout's branch", () => { + expect( + resolveWorktreeSwitchBranch({ selectedBranch: "release", worktreeBaseBranch: "dev" }), + ).toBeNull(); + }); + + it("leaves the branch to fill while settings are still loading", () => { + expect( + resolveWorktreeSwitchBranch({ selectedBranch: "release", worktreeBaseBranch: null }), + ).toBeNull(); + }); + + it("keeps today's behavior without a configured base", () => { + expect(resolveWorktreeSwitchBranch({ selectedBranch: "release", worktreeBaseBranch: "" })).toBe( + "release", + ); }); }); diff --git a/apps/mobile/src/features/threads/new-task-context-presentation.ts b/apps/mobile/src/features/threads/new-task-context-presentation.ts index 7b06dfcecffda..9caf5f11dbebc 100644 --- a/apps/mobile/src/features/threads/new-task-context-presentation.ts +++ b/apps/mobile/src/features/threads/new-task-context-presentation.ts @@ -79,6 +79,17 @@ export function resolveNewTaskLocalWorkspaceSelection(input: { }; } +/** + * A checkout's branch is not a worktree base, so leaving it for a new worktree starts from the + * configured base. A null base means settings have not loaded, so the branch stays unset to fill. + */ +export function resolveWorktreeSwitchBranch(input: { + readonly selectedBranch: string | null; + readonly worktreeBaseBranch: string | null; +}): string | null { + return input.worktreeBaseBranch === "" ? input.selectedBranch : null; +} + export function resolveNewTaskBranchLabel( input: { readonly branchName: string | null; @@ -134,10 +145,9 @@ export function filterNewTaskBranches( } /** - * A worktree with no chosen base starts from the default branch, and a local - * selection the user just switched to follows the current checkout until refs - * load. Both are derived, never written back, so a late ref list or t3.json - * default still wins. + * A worktree with no chosen base starts from the configured base, else the default branch, + * and a local selection the user just switched to follows the current checkout until refs + * load. Both are derived, never written back, so a late ref list or t3.json default still wins. */ export function fillNewTaskWorkspaceBranch(input: { readonly selection: ComposerDraftWorkspaceSelection; @@ -150,17 +160,18 @@ export function fillNewTaskWorkspaceBranch(input: { }>; readonly projectCwd: string | null; readonly worktreeDefaultSettled: boolean; + readonly worktreeBaseBranch: string; }): ComposerDraftWorkspaceSelection { const { selection } = input; if (selection.branch !== null) return selection; if (selection.mode === "worktree") { // The default may only exist as origin/, so search remote refs too. - const base = + const fallback = input.branches.find((branch) => branch.isDefault) ?? - input.branches.find((branch) => !branch.isRemote && branch.current) ?? - null; + input.branches.find((branch) => !branch.isRemote && branch.current); + const base = input.worktreeBaseBranch || fallback?.name; return input.worktreeDefaultSettled && base - ? { ...selection, branch: base.name, worktreePath: null } + ? { ...selection, branch: base, worktreePath: null } : selection; } if (!selection.followsCurrentCheckout || input.projectCwd === null) return selection; @@ -187,6 +198,7 @@ export function resolveNewTaskDraftWorkspace(input: { readonly isGitRepo: boolean; readonly branches: Parameters[0]["branches"]; readonly projectCwd: string | null; + readonly worktreeBaseBranch: string; }): ComposerDraftWorkspaceSelection { const selection = input.canChooseWorkspace ? input.selection : undefined; return fillNewTaskWorkspaceBranch({ @@ -198,5 +210,6 @@ export function resolveNewTaskDraftWorkspace(input: { branches: input.branches, projectCwd: input.projectCwd, worktreeDefaultSettled: selection?.mode !== undefined || input.defaultModeSettled, + worktreeBaseBranch: input.worktreeBaseBranch, }); } diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.tsx index 44d306c0abdf3..4d2627554e056 100644 --- a/apps/mobile/src/features/threads/new-task-flow-provider.tsx +++ b/apps/mobile/src/features/threads/new-task-flow-provider.tsx @@ -89,6 +89,7 @@ import { import { useMobileProjectGroupingSettings } from "../../state/project-grouping"; import { resolveNewTaskDraftWorkspace, + resolveWorktreeSwitchBranch, resolveNewTaskBranchWorktreePath, resolveNewTaskLocalWorkspaceSelection, } from "./new-task-context-presentation"; @@ -407,6 +408,7 @@ export function NewTaskFlowProvider( isGitRepo, branches: allBranchRefs, projectCwd: selectedProject?.workspaceRoot ?? null, + worktreeBaseBranch: projectSettings.settings.newWorktreesBaseBranch, }); const workspaceSelection = resolveWorkspaceSelection(selectedProjectDraft.workspaceSelection); const workspaceMode = workspaceSelection.mode; @@ -425,6 +427,8 @@ export function NewTaskFlowProvider( // only the explicit flag is ever written back to the draft, so the resolved // value keeps tracking the server setting when the config loads late. const draftStartFromOrigin = selectedProjectDraft.workspaceSelection?.startFromOrigin; + // Writing the filled worktree base back would pin it, so later setting changes would not apply. + const explicitDraftBranch = selectedProjectDraft.workspaceSelection?.branch ?? null; const startFromOrigin = isGitRepo && (draftStartFromOrigin ?? projectSettings.settings.newWorktreesStartFromOrigin); const defaultRuntimeMode = projectSettings.settings.defaultRuntimeMode; @@ -672,7 +676,17 @@ export function NewTaskFlowProvider( updateComposerDraftSettings(selectedProjectDraftKey, { workspaceSelection: { mode, - branch: mode === "local" ? localSelection.branch : selectedBranchName, + branch: + mode === "local" + ? localSelection.branch + : workspaceMode === "local" + ? resolveWorktreeSwitchBranch({ + selectedBranch: selectedBranchName, + worktreeBaseBranch: selectedEnvironmentServerConfig + ? projectSettings.settings.newWorktreesBaseBranch + : null, + }) + : explicitDraftBranch, worktreePath: mode === "local" ? localSelection.worktreePath : selectedWorktreePath, ...(draftStartFromOrigin !== undefined ? { startFromOrigin: draftStartFromOrigin } : {}), // Refs have not named the current branch yet; the selection follows it. @@ -708,7 +722,7 @@ export function NewTaskFlowProvider( updateComposerDraftSettings(selectedProjectDraftKey, { workspaceSelection: { mode: workspaceMode, - branch: selectedBranchName, + branch: workspaceMode === "worktree" ? explicitDraftBranch : selectedBranchName, worktreePath: selectedWorktreePath, startFromOrigin: value, ...(selectedBranchName === null && workspaceSelection.followsCurrentCheckout diff --git a/apps/mobile/src/features/threads/thread-list-v2-items.tsx b/apps/mobile/src/features/threads/thread-list-v2-items.tsx index 4d7b76ce2c884..15efecddb5fff 100644 --- a/apps/mobile/src/features/threads/thread-list-v2-items.tsx +++ b/apps/mobile/src/features/threads/thread-list-v2-items.tsx @@ -513,6 +513,7 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props canChooseWorkspace: !projectDefaults.isScratch, defaultMode: projectDefaults.defaultWorkspaceMode, defaultModeSettled: projectDefaults.defaultWorkspaceModeSettled, + worktreeBaseBranch: projectDefaults.projectSettings.settings.newWorktreesBaseBranch, }; const draftBranchRefs = useBranches({ environmentId: pendingTask.environmentId, diff --git a/apps/mobile/src/i18n/translations/de.json b/apps/mobile/src/i18n/translations/de.json index c9d43d96b3eb8..80f458488507a 100644 --- a/apps/mobile/src/i18n/translations/de.json +++ b/apps/mobile/src/i18n/translations/de.json @@ -5206,5 +5206,9 @@ "ad208e3e32c85029": "Alle ausblenden", "3328503592789bed": "Zen", "856812e7e1fc445e": "Tool-Aufrufe im Chat", - "8d545d54c0a9e950": "Die Befehle, Bearbeitungen und Suchen ausblenden, die Agenten ausführen. „Erfolgreiche ausblenden“ behält Fehler. „Zen“ zeigt nur endgültige Antworten. Genehmigungen, Fragen und Fehler werden immer angezeigt." + "8d545d54c0a9e950": "Die Befehle, Bearbeitungen und Suchen ausblenden, die Agenten ausführen. „Erfolgreiche ausblenden“ behält Fehler. „Zen“ zeigt nur endgültige Antworten. Genehmigungen, Fragen und Fehler werden immer angezeigt.", + "a4d45e701fd1ecd6": "Repository-Standard", + "4bd759216dc953fc": "Wähle ein Projekt, um seine Branches aufzulisten.", + "16adc6c497760dc9": "Der Branch, Tag oder Commit, von dem neue Worktrees starten, etwa dev. Leer lassen, um den Standardbranch des Repositorys zu verwenden.", + "a136ae2ffe6eeb7c": "Basisbranch für neue Worktrees" } diff --git a/apps/mobile/src/i18n/translations/en.json b/apps/mobile/src/i18n/translations/en.json index 7a89a1cf37c22..cb89f809643a6 100644 --- a/apps/mobile/src/i18n/translations/en.json +++ b/apps/mobile/src/i18n/translations/en.json @@ -5207,5 +5207,9 @@ "ad208e3e32c85029": "Hide all", "3328503592789bed": "Zen", "856812e7e1fc445e": "Tool calls in chat", - "8d545d54c0a9e950": "Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show." + "8d545d54c0a9e950": "Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show.", + "a4d45e701fd1ecd6": "Repository default", + "4bd759216dc953fc": "Choose a project to list its branches.", + "16adc6c497760dc9": "The branch, tag, or commit new worktrees start from, such as dev. Leave empty to use the repository’s default branch.", + "a136ae2ffe6eeb7c": "Base branch for new worktrees" } diff --git a/apps/mobile/src/i18n/translations/es.json b/apps/mobile/src/i18n/translations/es.json index 288dbfc7da2cf..2425ad7e6c10b 100644 --- a/apps/mobile/src/i18n/translations/es.json +++ b/apps/mobile/src/i18n/translations/es.json @@ -5200,5 +5200,9 @@ "ad208e3e32c85029": "Ocultar todo", "3328503592789bed": "Zen", "856812e7e1fc445e": "Llamadas a herramientas en el chat", - "8d545d54c0a9e950": "Oculta los comandos, ediciones y búsquedas que ejecutan los agentes. Ocultar las correctas mantiene los fallos. Zen solo muestra las respuestas finales. Las aprobaciones, preguntas y errores siempre se muestran." + "8d545d54c0a9e950": "Oculta los comandos, ediciones y búsquedas que ejecutan los agentes. Ocultar las correctas mantiene los fallos. Zen solo muestra las respuestas finales. Las aprobaciones, preguntas y errores siempre se muestran.", + "a4d45e701fd1ecd6": "Predeterminada del repositorio", + "4bd759216dc953fc": "Elige un proyecto para ver sus ramas.", + "16adc6c497760dc9": "La rama, etiqueta o commit desde el que parten los nuevos worktrees, como dev. Déjalo vacío para usar la rama predeterminada del repositorio.", + "a136ae2ffe6eeb7c": "Rama base para nuevos worktrees" } diff --git a/apps/mobile/src/i18n/translations/fr.json b/apps/mobile/src/i18n/translations/fr.json index 28ec2284fca74..75411196e8434 100644 --- a/apps/mobile/src/i18n/translations/fr.json +++ b/apps/mobile/src/i18n/translations/fr.json @@ -5200,5 +5200,9 @@ "ad208e3e32c85029": "Tout masquer", "3328503592789bed": "Zen", "856812e7e1fc445e": "Appels d’outils dans la discussion", - "8d545d54c0a9e950": "Masque les commandes, modifications et recherches lancées par les agents. Masquer les réussis garde les échecs. Zen n’affiche que les réponses finales. Les approbations, questions et erreurs s’affichent toujours." + "8d545d54c0a9e950": "Masque les commandes, modifications et recherches lancées par les agents. Masquer les réussis garde les échecs. Zen n’affiche que les réponses finales. Les approbations, questions et erreurs s’affichent toujours.", + "a4d45e701fd1ecd6": "Valeur par défaut du dépôt", + "4bd759216dc953fc": "Choisissez un projet pour afficher ses branches.", + "16adc6c497760dc9": "La branche, le tag ou le commit de départ des nouveaux worktrees, par exemple dev. Laissez vide pour utiliser la branche par défaut du dépôt.", + "a136ae2ffe6eeb7c": "Branche de base des nouveaux worktrees" } diff --git a/apps/mobile/src/i18n/translations/ja.json b/apps/mobile/src/i18n/translations/ja.json index f6741fdb8b775..56905df70315e 100644 --- a/apps/mobile/src/i18n/translations/ja.json +++ b/apps/mobile/src/i18n/translations/ja.json @@ -5182,5 +5182,9 @@ "ad208e3e32c85029": "すべて非表示", "3328503592789bed": "Zen", "856812e7e1fc445e": "チャット内のツール呼び出し", - "8d545d54c0a9e950": "エージェントが実行するコマンド、編集、検索を非表示にします。「成功したものを非表示」では失敗は表示されます。Zen では最終的な回答だけを表示します。承認、質問、エラーは常に表示されます。" + "8d545d54c0a9e950": "エージェントが実行するコマンド、編集、検索を非表示にします。「成功したものを非表示」では失敗は表示されます。Zen では最終的な回答だけを表示します。承認、質問、エラーは常に表示されます。", + "a4d45e701fd1ecd6": "リポジトリの既定", + "4bd759216dc953fc": "ブランチを表示するプロジェクトを選択してください。", + "16adc6c497760dc9": "新しいワークツリーの開始元となるブランチ、タグ、コミット(例: dev)。空欄の場合はリポジトリの既定ブランチを使用します。", + "a136ae2ffe6eeb7c": "新しいワークツリーのベースブランチ" } diff --git a/apps/mobile/src/i18n/translations/ko.json b/apps/mobile/src/i18n/translations/ko.json index b1ef20ba0f347..9caf6e9cd44ee 100644 --- a/apps/mobile/src/i18n/translations/ko.json +++ b/apps/mobile/src/i18n/translations/ko.json @@ -5186,5 +5186,9 @@ "ad208e3e32c85029": "모두 숨기기", "3328503592789bed": "Zen", "856812e7e1fc445e": "채팅의 도구 호출", - "8d545d54c0a9e950": "에이전트가 실행하는 명령, 편집, 검색을 숨깁니다. 성공한 항목 숨기기는 실패를 남겨 둡니다. Zen은 최종 답변만 표시합니다. 승인, 질문, 오류는 항상 표시됩니다." + "8d545d54c0a9e950": "에이전트가 실행하는 명령, 편집, 검색을 숨깁니다. 성공한 항목 숨기기는 실패를 남겨 둡니다. Zen은 최종 답변만 표시합니다. 승인, 질문, 오류는 항상 표시됩니다.", + "a4d45e701fd1ecd6": "저장소 기본값", + "4bd759216dc953fc": "브랜치를 나열할 프로젝트를 선택하세요.", + "16adc6c497760dc9": "새 워크트리의 시작 브랜치, 태그 또는 커밋입니다(예: dev). 비워 두면 저장소의 기본 브랜치를 사용합니다.", + "a136ae2ffe6eeb7c": "새 워크트리의 기준 브랜치" } diff --git a/apps/mobile/src/i18n/translations/pt-BR.json b/apps/mobile/src/i18n/translations/pt-BR.json index b40494fca3885..ca022d788b37a 100644 --- a/apps/mobile/src/i18n/translations/pt-BR.json +++ b/apps/mobile/src/i18n/translations/pt-BR.json @@ -5200,5 +5200,9 @@ "ad208e3e32c85029": "Ocultar todas", "3328503592789bed": "Zen", "856812e7e1fc445e": "Chamadas de ferramentas no chat", - "8d545d54c0a9e950": "Oculta os comandos, edições e pesquisas que os agentes executam. \"Ocultar bem-sucedidas\" mantém as falhas. Zen mostra só as respostas finais. Aprovações, perguntas e erros sempre aparecem." + "8d545d54c0a9e950": "Oculta os comandos, edições e pesquisas que os agentes executam. \"Ocultar bem-sucedidas\" mantém as falhas. Zen mostra só as respostas finais. Aprovações, perguntas e erros sempre aparecem.", + "a4d45e701fd1ecd6": "Padrão do repositório", + "4bd759216dc953fc": "Escolha um projeto para listar suas branches.", + "16adc6c497760dc9": "A branch, tag ou commit de origem dos novos worktrees, como dev. Deixe vazio para usar a branch padrão do repositório.", + "a136ae2ffe6eeb7c": "Branch base para novos worktrees" } diff --git a/apps/mobile/src/i18n/translations/ru.json b/apps/mobile/src/i18n/translations/ru.json index cadf07e57eda9..597dad49a5bbb 100644 --- a/apps/mobile/src/i18n/translations/ru.json +++ b/apps/mobile/src/i18n/translations/ru.json @@ -5280,5 +5280,9 @@ "ad208e3e32c85029": "Скрывать все", "3328503592789bed": "Дзен", "856812e7e1fc445e": "Вызовы инструментов в чате", - "8d545d54c0a9e950": "Скрывать команды, правки и поиски, которые выполняют агенты. «Скрывать успешные» оставляет ошибки. «Дзен» показывает только итоговые ответы. Запросы подтверждения, вопросы и ошибки показываются всегда." + "8d545d54c0a9e950": "Скрывать команды, правки и поиски, которые выполняют агенты. «Скрывать успешные» оставляет ошибки. «Дзен» показывает только итоговые ответы. Запросы подтверждения, вопросы и ошибки показываются всегда.", + "a4d45e701fd1ecd6": "По умолчанию в репозитории", + "4bd759216dc953fc": "Выберите проект, чтобы увидеть его ветки.", + "16adc6c497760dc9": "Ветка, тег или коммит, от которого создаются новые рабочие деревья, например dev. Оставьте пустым, чтобы использовать ветку репозитория по умолчанию.", + "a136ae2ffe6eeb7c": "Базовая ветка для новых рабочих деревьев" } diff --git a/apps/mobile/src/i18n/translations/sv.json b/apps/mobile/src/i18n/translations/sv.json index 3a0273aef36fd..80f5e084ce2e5 100644 --- a/apps/mobile/src/i18n/translations/sv.json +++ b/apps/mobile/src/i18n/translations/sv.json @@ -5206,5 +5206,9 @@ "ad208e3e32c85029": "Dölj alla", "3328503592789bed": "Zen", "856812e7e1fc445e": "Verktygsanrop i chatten", - "8d545d54c0a9e950": "Dölj kommandon, redigeringar och sökningar som agenter kör. Dölj lyckade behåller misslyckanden. Zen visar bara slutliga svar. Godkännanden, frågor och fel visas alltid." + "8d545d54c0a9e950": "Dölj kommandon, redigeringar och sökningar som agenter kör. Dölj lyckade behåller misslyckanden. Zen visar bara slutliga svar. Godkännanden, frågor och fel visas alltid.", + "a4d45e701fd1ecd6": "Kodförrådets standard", + "4bd759216dc953fc": "Välj ett projekt för att visa dess grenar.", + "16adc6c497760dc9": "Grenen, taggen eller committen som nya worktrees utgår från, till exempel dev. Lämna tomt för att använda kodförrådets standardgren.", + "a136ae2ffe6eeb7c": "Basgren för nya worktrees" } diff --git a/apps/mobile/src/i18n/translations/zh.json b/apps/mobile/src/i18n/translations/zh.json index f1c394c60c606..f3b954a5e8f24 100644 --- a/apps/mobile/src/i18n/translations/zh.json +++ b/apps/mobile/src/i18n/translations/zh.json @@ -5191,5 +5191,9 @@ "ad208e3e32c85029": "全部隐藏", "3328503592789bed": "专注模式", "856812e7e1fc445e": "聊天中的工具调用", - "8d545d54c0a9e950": "隐藏智能体执行的命令、编辑和搜索。“隐藏成功的调用”仍保留失败项;“专注模式”仅显示最终回答。审批、提问和错误始终显示。" + "8d545d54c0a9e950": "隐藏智能体执行的命令、编辑和搜索。“隐藏成功的调用”仍保留失败项;“专注模式”仅显示最终回答。审批、提问和错误始终显示。", + "a4d45e701fd1ecd6": "仓库默认值", + "4bd759216dc953fc": "选择一个项目以列出其分支。", + "16adc6c497760dc9": "新工作树的起始分支、标签或提交,例如 dev。留空则使用仓库的默认分支。", + "a136ae2ffe6eeb7c": "新工作树的基础分支" } diff --git a/apps/mobile/src/state/pending-new-tasks-model.test.ts b/apps/mobile/src/state/pending-new-tasks-model.test.ts index 9e523972a63c3..3696be6c2a61b 100644 --- a/apps/mobile/src/state/pending-new-tasks-model.test.ts +++ b/apps/mobile/src/state/pending-new-tasks-model.test.ts @@ -22,6 +22,7 @@ const localDefault: PendingDraftProjectDefaults = { canChooseWorkspace: true, defaultMode: "local", defaultModeSettled: true, + worktreeBaseBranch: "", }; const worktreeDefault: PendingDraftProjectDefaults = { ...localDefault, defaultMode: "worktree" }; const resolve = ( @@ -72,6 +73,14 @@ describe("resolvePendingDraftBranch", () => { const worktree = draft({ mode: "worktree", branch: null, worktreePath: null }); expect(pendingDraftBranchNeedsRefs(worktree, localDefault)).toBe(true); expect(resolve({ draft: worktree, branches, projectCwd })).toBe("origin/main"); + expect( + resolve({ + draft: worktree, + defaults: { ...localDefault, worktreeBaseBranch: "dev" }, + branches, + projectCwd, + }), + ).toBe("dev"); }); it("shows the current branch for a local draft that follows the checkout", () => { diff --git a/apps/mobile/src/state/pending-new-tasks-model.ts b/apps/mobile/src/state/pending-new-tasks-model.ts index bbcfa94346967..d1c2569ac8b6d 100644 --- a/apps/mobile/src/state/pending-new-tasks-model.ts +++ b/apps/mobile/src/state/pending-new-tasks-model.ts @@ -63,6 +63,7 @@ export interface PendingDraftProjectDefaults { readonly canChooseWorkspace: boolean; readonly defaultMode: "local" | "worktree"; readonly defaultModeSettled: boolean; + readonly worktreeBaseBranch: string; } /** @@ -93,6 +94,7 @@ export function resolvePendingDraftBranch(input: { isGitRepo: input.isGitRepo, branches: input.branches, projectCwd: input.projectCwd, + worktreeBaseBranch: input.defaults.worktreeBaseBranch, }).branch; } diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts index 99ae0bda81bba..0af9141b8cb7d 100644 --- a/apps/web/src/components/BranchToolbar.logic.test.ts +++ b/apps/web/src/components/BranchToolbar.logic.test.ts @@ -12,6 +12,7 @@ import { resolveDefaultWorktreeBaseBranch, resolveLocalCheckoutBranchMismatch, resolveLockedWorkspaceLabel, + resolveWorktreeBaseBranchCandidate, sanitizeNewRefName, shouldIncludeBranchPickerItem, isBranchHoldCurrent, @@ -50,6 +51,33 @@ describe("resolveBranchToolbarPrBranch", () => { }); }); +describe("resolveWorktreeBaseBranchCandidate", () => { + const input = { + configuredBaseBranch: "", + isRepo: true, + refs: [ + { name: "feature/open-thread", isDefault: false, current: true }, + { name: "main", isDefault: true, current: false }, + ], + }; + + it("uses the repository default, not the open thread's branch, when no base is configured", () => { + expect(resolveWorktreeBaseBranchCandidate(input)).toBe("main"); + }); + + it("uses the configured base even when the loaded refs do not include it", () => { + expect(resolveWorktreeBaseBranchCandidate({ ...input, configuredBaseBranch: "dev" })).toBe( + "dev", + ); + }); + + it("ignores a configured base outside a Git repository", () => { + expect( + resolveWorktreeBaseBranchCandidate({ configuredBaseBranch: "dev", isRepo: false, refs: [] }), + ).toBeNull(); + }); +}); + describe("resolveDefaultWorktreeBaseBranch", () => { it("offers nothing while a clone has no refs, then the default branch once they are listed", () => { expect(resolveDefaultWorktreeBaseBranch([])).toBeNull(); diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts index 9f2550b064998..43b79beda1006 100644 --- a/apps/web/src/components/BranchToolbar.logic.ts +++ b/apps/web/src/components/BranchToolbar.logic.ts @@ -258,6 +258,16 @@ export function resolveDefaultWorktreeBaseBranch( return (refs.find((ref) => ref.isDefault) ?? refs.find((ref) => ref.current))?.name ?? null; } +/** A configured base is used as typed; it may sit outside the loaded ref page or exist only on a remote. */ +export function resolveWorktreeBaseBranchCandidate(input: { + configuredBaseBranch: string; + isRepo: boolean; + refs: ReadonlyArray>; +}): string | null { + if (input.isRepo && input.configuredBaseBranch !== "") return input.configuredBaseBranch; + return resolveDefaultWorktreeBaseBranch(input.refs); +} + export function resolveBranchTriggerLabel( input: { activeWorktreePath: string | null; diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx index e10c48ce7a9a8..d159a0d25b400 100644 --- a/apps/web/src/components/BranchToolbarBranchSelector.tsx +++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx @@ -1,3 +1,5 @@ +import { useAtomValue } from "@effect/atom-react"; +import { resolveProjectSettings } from "@t3tools/shared/projectSettings"; import { thrownErrorMessage } from "@t3tools/client-runtime/errors"; import { ThreadDetailsControl } from "./chat/ThreadDetailsControl"; import { ComposerContextLabel } from "./ComposerContextLabel"; @@ -39,6 +41,7 @@ import { useProjectClone } from "../state/projectClones"; import { readThreadShell, useProject, useQuietThreadShell } from "../state/entities"; import { useEnvironmentQuery } from "../state/query"; import { readEnvironmentScope, useEnvironmentScope } from "~/state/session"; +import { serverEnvironment } from "~/state/server"; import { threadEnvironment } from "../state/threads"; import { useAtomCommand } from "../state/use-atom-command"; import { vcsEnvironment } from "../state/vcs"; @@ -60,9 +63,9 @@ import { resolveBranchSelectionTarget, resolveBranchToolbarValue, resolveConfirmedSelectedRef, - resolveDefaultWorktreeBaseBranch, resolveDraftEnvModeAfterBranchChange, resolveEffectiveEnvMode, + resolveWorktreeBaseBranchCandidate, sanitizeNewRefName, shouldIncludeBranchPickerItem, } from "./BranchToolbar.logic"; @@ -162,6 +165,9 @@ export function BranchToolbarBranchSelector({ ? scopeProjectRef(draftThread.environmentId, draftThread.projectId) : null; const activeProject = useProject(activeProjectRef); + const environmentServerSettings = useAtomValue( + serverEnvironment.settingsValueAtom(environmentId), + ); const activeThreadId = serverThread?.id ?? (draftThread ? threadId : undefined); const activeThreadBranch = @@ -613,9 +619,18 @@ export function BranchToolbarBranchSelector({ }); }; - const worktreeBaseBranchCandidate = isInitialBranchesLoadPending - ? null - : resolveDefaultWorktreeBaseBranch(refs); + // Wait for settings too, so the repository default cannot claim the draft before a configured base arrives. + const worktreeBaseBranchCandidate = + isInitialBranchesLoadPending || environmentServerSettings === null + ? null + : resolveWorktreeBaseBranchCandidate({ + configuredBaseBranch: resolveProjectSettings( + environmentServerSettings, + activeProject?.id ?? null, + ).settings.newWorktreesBaseBranch, + isRepo: branchRefState.data?.isRepo ?? branchStatusQuery.data?.isRepo ?? false, + refs, + }); const projectCloneDone = useProjectClone(activeProjectRef)?.phase === "done"; const refreshStaleRefs = useEffectEvent(() => { diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index e69de418cd3ee..2c1f36345ac7f 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -2930,6 +2930,8 @@ export default function ChatView(props: ChatViewProps) { runtimeMode, isLocalDraftThread, canOverrideServerThreadEnvMode, + envMode, + setPendingServerThreadBranch, setPendingServerThreadEnvModeEntry, setPendingServerThreadStartFromOriginByThreadId, scheduleComposerFocus: scheduleComposerFocusStable, diff --git a/apps/web/src/components/WorktreeBaseBranchPicker.browser.test.tsx b/apps/web/src/components/WorktreeBaseBranchPicker.browser.test.tsx index afd154a530db8..ae2732dec4a85 100644 --- a/apps/web/src/components/WorktreeBaseBranchPicker.browser.test.tsx +++ b/apps/web/src/components/WorktreeBaseBranchPicker.browser.test.tsx @@ -74,4 +74,31 @@ describe("WorktreeBaseBranchPicker", () => { expect(onValueChange).toHaveBeenCalledExactlyOnceWith(selected); }, ); + + it("selects the default option, or a typed ref that is not listed", async () => { + setup(); + mocks.resolvedQueries.add("v1.2"); + const onValueChange = vi.fn(); + const picker = () => ( + + ); + await using screen = await render(picker()); + + await userEvent.click(screen.getByRole("combobox")); + await userEvent.click(page.getByRole("option", { name: /^Repository default/ })); + expect(onValueChange).toHaveBeenLastCalledWith(""); + + await userEvent.click(screen.getByRole("combobox")); + await userEvent.type(page.getByPlaceholder("Search refs..."), "v1.2"); + await userEvent.click(page.getByRole("option", { name: 'Use "v1.2"' })); + expect(onValueChange).toHaveBeenLastCalledWith("v1.2"); + }); }); diff --git a/apps/web/src/components/WorktreeBaseBranchPicker.tsx b/apps/web/src/components/WorktreeBaseBranchPicker.tsx index dd6520a11dab8..5cf3beb2aebd4 100644 --- a/apps/web/src/components/WorktreeBaseBranchPicker.tsx +++ b/apps/web/src/components/WorktreeBaseBranchPicker.tsx @@ -10,7 +10,11 @@ import { BranchPicker, BranchPickerRefItem } from "./BranchPicker"; import { resolveBranchTriggerLabel, sanitizeNewRefName } from "./BranchToolbar.logic"; import { MiddleTruncate } from "./ui/middle-truncate"; import { Button } from "./ui/button"; -import { ComboboxTrigger } from "./ui/combobox"; +import { ComboboxItem, ComboboxTrigger } from "./ui/combobox"; + +// Refs cannot contain NUL, so these item values never collide with a ref name. +const DEFAULT_ITEM_VALUE = "\u0000default"; +const CUSTOM_ITEM_PREFIX = "\u0000custom:"; export function WorktreeBaseBranchPicker({ environmentId, @@ -19,32 +23,45 @@ export function WorktreeBaseBranchPicker({ onValueChange, startFromOrigin, onStartFromOriginChange, + defaultOption, + allowCustomRef = false, + emptyLabel, disabled = false, id, + "aria-label": ariaLabel, }: { - environmentId: EnvironmentId; + environmentId: EnvironmentId | null; cwd: string | null; value: string; onValueChange: (branch: string) => void; startFromOrigin: boolean; - onStartFromOriginChange: (checked: boolean) => void; + /** Omit when the start-from-remote choice is edited elsewhere. */ + onStartFromOriginChange?: (checked: boolean) => void; + /** Lists an item that selects the empty value; its badge names the default ref. */ + defaultOption?: { label: string }; + /** Lets a typed name be used as is, for a tag, a commit, or a ref outside the list. */ + allowCustomRef?: boolean; + /** Shows the ref name as is, and this label while the value is empty. */ + emptyLabel?: string; disabled?: boolean; id?: string; + "aria-label"?: string; }) { const gt = useGT(); const messages = useMessages(); const [open, setOpen] = useState(false); const [query, setQuery] = useState(""); + const trimmedQuery = query.trim(); const branches = usePaginatedBranches( { environmentId, cwd, - query: sanitizeNewRefName(query.trim()), + query: sanitizeNewRefName(trimmedQuery), }, messages, ); const selectedRefQuery = useEnvironmentQuery( - cwd && value + environmentId && cwd && value ? vcsEnvironment.listRefs({ environmentId, input: { cwd, query: value, limit: 10 }, @@ -54,75 +71,127 @@ export function WorktreeBaseBranchPicker({ const selectedRef = branches.refs.find((branch) => branch.name === value) ?? selectedRefQuery.data?.refs.find((branch) => branch.name === value); - const label = resolveBranchTriggerLabel( - { - activeWorktreePath: null, - effectiveEnvMode: "worktree", - resolvedActiveBranch: value || null, - resolvedActiveBranchIsRemote: selectedRef ? selectedRef.isRemote === true : null, - startFromOrigin, - }, - messages, - ); + const label = + emptyLabel !== undefined + ? value || emptyLabel + : resolveBranchTriggerLabel( + { + activeWorktreePath: null, + effectiveEnvMode: "worktree", + resolvedActiveBranch: value || null, + resolvedActiveBranchIsRemote: selectedRef ? selectedRef.isRemote === true : null, + startFromOrigin, + }, + messages, + ); const branchByName = new Map(branches.refs.map((branch) => [branch.name, branch])); - const items = [...branchByName.keys()]; + const defaultRefName = branches.refs.find((branch) => branch.isDefault)?.name; + const customRefItemValue = + allowCustomRef && trimmedQuery !== "" && !branchByName.has(trimmedQuery) + ? `${CUSTOM_ITEM_PREFIX}${trimmedQuery}` + : null; + const items = [ + ...(defaultOption && trimmedQuery === "" ? [DEFAULT_ITEM_VALUE] : []), + ...branchByName.keys(), + ...(customRefItemValue ? [customRefItemValue] : []), + ]; const hasNextPage = branches.data?.nextCursor != null; - const statusText = - branches.error ?? - (branches.isPending && branches.data === null - ? gt("Loading refs...") - : branches.isFetchingNextPage - ? gt("Loading more refs...") - : hasNextPage - ? gt( - "{total, plural, one {Showing {shown} of {total} refs} other {Showing {shown} of {total} refs}}", - { - shown: branches.refs.length, - total: String(branches.data?.totalCount), - }, - ) - : null); + const statusText = !cwd + ? gt("Choose a project to list its branches.") + : (branches.error ?? + (branches.isPending && branches.data === null + ? gt("Loading refs...") + : branches.isFetchingNextPage + ? gt("Loading more refs...") + : hasNextPage + ? gt( + "{total, plural, one {Showing {shown} of {total} refs} other {Showing {shown} of {total} refs}}", + { + shown: branches.refs.length, + total: String(branches.data?.totalCount), + }, + ) + : null)); const handleOpenChange = (next: boolean) => { setOpen(next); if (!next) setQuery(""); }; + const selectItem = (itemValue: string) => { + if (itemValue === DEFAULT_ITEM_VALUE) onValueChange(""); + else if (itemValue.startsWith(CUSTOM_ITEM_PREFIX)) + onValueChange(itemValue.slice(CUSTOM_ITEM_PREFIX.length)); + else onValueChange(itemValue); + handleOpenChange(false); + }; return ( { - onValueChange(name); - handleOpenChange(false); - }} + onSelectItem={selectItem} hasNextPage={hasNextPage} isFetchingNextPage={branches.isFetchingNextPage} onLoadNext={branches.loadNext} statusText={statusText} - originControl={{ checked: startFromOrigin, onCheckedChange: onStartFromOriginChange }} + originControl={ + onStartFromOriginChange + ? { checked: startFromOrigin, onCheckedChange: onStartFromOriginChange } + : undefined + } popupProps={{ align: "start", side: "bottom", className: "flex w-80 flex-col" }} - renderItem={(name, index) => { - const branch = branchByName.get(name); + renderItem={(itemValue, index) => { + if (defaultOption && itemValue === DEFAULT_ITEM_VALUE) { + return ( + selectItem(itemValue)} + > +
+ {defaultOption.label} + {defaultRefName && ( + + {defaultRefName} + + )} +
+
+ ); + } + if (customRefItemValue && itemValue === customRefItemValue) { + return ( + selectItem(itemValue)} + > + {gt('Use "{ref}"', { ref: trimmedQuery })} + + ); + } + const branch = branchByName.get(itemValue); return branch ? ( { - onValueChange(branch.name); - handleOpenChange(false); - }} + onClick={() => selectItem(branch.name)} /> ) : null; }} > } className="w-full justify-between " > diff --git a/apps/web/src/components/chat/useComposerSelection.browser.test.tsx b/apps/web/src/components/chat/useComposerSelection.browser.test.tsx index 147a48aa8bd38..df62f5b27933c 100644 --- a/apps/web/src/components/chat/useComposerSelection.browser.test.tsx +++ b/apps/web/src/components/chat/useComposerSelection.browser.test.tsx @@ -85,7 +85,11 @@ function Picker(props: { draftThread: null, activeThread: props.thread, activeRuntime: props.runtime, - activeProjectSettings: { settings: { newWorktreesStartFromOrigin: false } }, + activeProjectSettings: { + settings: { newWorktreesStartFromOrigin: false, newWorktreesBaseBranch: "" }, + }, + envMode: "local", + setPendingServerThreadBranch: () => {}, settings: DEFAULT_UNIFIED_SETTINGS, providerStatuses: providers, lockedProvider: null, diff --git a/apps/web/src/components/chat/useComposerSelection.ts b/apps/web/src/components/chat/useComposerSelection.ts index 77fdd4a459df2..19768ccfebd4d 100644 --- a/apps/web/src/components/chat/useComposerSelection.ts +++ b/apps/web/src/components/chat/useComposerSelection.ts @@ -1,3 +1,4 @@ +import { useAtomValue } from "@effect/atom-react"; import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell"; import type { UnifiedSettings } from "@t3tools/contracts"; import { useMessages } from "gt-react"; @@ -18,10 +19,12 @@ import { scopeThreadRef } from "@t3tools/client-runtime/environment"; import { type SetStateAction } from "react"; import { useNavigate } from "@tanstack/react-router"; import { toastManager } from "../ui/toast"; +import { serverEnvironment } from "~/state/server"; import { resolveAppModelSelectionForInstance } from "../../modelSelection"; import { draftModelSelectionApplies, resolveNewDraftStartFromOrigin, + shouldResetBranchForNewWorktree, threadHasStarted, } from "../../lib/chatThreadActions"; import { @@ -41,7 +44,10 @@ interface ComposerSelectionInput { readonly activeThread: EnvironmentThreadShell | undefined; readonly activeRuntime: ReturnType; readonly activeProjectSettings: { - readonly settings: { readonly newWorktreesStartFromOrigin: boolean }; + readonly settings: { + readonly newWorktreesStartFromOrigin: boolean; + readonly newWorktreesBaseBranch: string; + }; }; readonly settings: UnifiedSettings; readonly providerStatuses: ReadonlyArray; @@ -51,6 +57,8 @@ interface ComposerSelectionInput { readonly runtimeMode: RuntimeMode; readonly isLocalDraftThread: boolean; readonly canOverrideServerThreadEnvMode: boolean; + readonly envMode: DraftThreadEnvMode; + readonly setPendingServerThreadBranch: (branch: string | null) => void; readonly setPendingServerThreadEnvModeEntry: Dispatch< SetStateAction<{ readonly threadId: ThreadId; readonly mode: DraftThreadEnvMode } | null> >; @@ -80,10 +88,16 @@ export function useComposerSelection(input: ComposerSelectionInput) { runtimeMode, isLocalDraftThread, canOverrideServerThreadEnvMode, + envMode, + setPendingServerThreadBranch, setPendingServerThreadEnvModeEntry, setPendingServerThreadStartFromOriginByThreadId, scheduleComposerFocus, } = input; + const settingsLoaded = useAtomValue(serverEnvironment.settingsValueAtom(environmentId)) !== null; + const worktreeBaseBranch = settingsLoaded + ? activeProjectSettings.settings.newWorktreesBaseBranch + : null; const messages = useMessages(); const navigate = useNavigate(); const setStickyComposerModelSelection = useComposerDraftStore( @@ -242,6 +256,15 @@ export function useComposerSelection(input: ComposerSelectionInput) { if (multipleModelSelections !== null) return; if (canOverrideServerThreadEnvMode) { if (activeThread) setPendingServerThreadEnvModeEntry({ threadId: activeThread.id, mode }); + if ( + shouldResetBranchForNewWorktree({ + currentEnvMode: envMode, + nextEnvMode: mode, + worktreeBaseBranch, + }) + ) { + setPendingServerThreadBranch(null); + } scheduleComposerFocus(); return; } @@ -253,6 +276,13 @@ export function useComposerSelection(input: ComposerSelectionInput) { newWorktreesStartFromOrigin: activeProjectSettings.settings.newWorktreesStartFromOrigin, }), ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}), + ...(shouldResetBranchForNewWorktree({ + currentEnvMode: draftThread?.envMode, + nextEnvMode: mode, + worktreeBaseBranch, + }) + ? { branch: null } + : {}), }); } scheduleComposerFocus(); diff --git a/apps/web/src/components/settings/WorktreesSettings.tsx b/apps/web/src/components/settings/WorktreesSettings.tsx index 51c529f5d737a..d43f85149fc70 100644 --- a/apps/web/src/components/settings/WorktreesSettings.tsx +++ b/apps/web/src/components/settings/WorktreesSettings.tsx @@ -1,6 +1,7 @@ import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings"; import { useGT } from "gt-react"; +import { WorktreeBaseBranchPicker } from "../WorktreeBaseBranchPicker"; import { AdvancedSettings } from "./AdvancedSettings"; import { BranchNamingSettings } from "./BranchNamingSettings"; import { WorktreeSubmodulesRow } from "./ProjectDefaultsSettings"; @@ -14,7 +15,61 @@ import { } from "./settingsLayout"; import { useSearchableSetting } from "./settingsSearch"; import { WorktreeCleanupSection, WorktreesDirectoryRow } from "./StorageSettings"; -import { useScopedSettings, useUpdateScopedSettings } from "./useScopedSettings"; +import { + useScopedSettings, + useScopedSettingsMixed, + useUpdateScopedSettings, +} from "./useScopedSettings"; + +function BaseBranchRow() { + const gt = useGT(); + const searchableSetting = useSearchableSetting(); + const settings = useScopedSettings(); + const { scope, target } = useSettingsScope(); + const updateSettings = useUpdateScopedSettings(); + const mixed = useScopedSettingsMixed(["newWorktreesBaseBranch"]); + const member = + (scope.kind === "project" || scope.kind === "checkout") && target?.projectId + ? scope.members.find( + (candidate) => + candidate.id === target.projectId && candidate.environmentId === target.environmentId, + ) + : undefined; + return ( + updateSettings({ newWorktreesBaseBranch: "" })} + /> + ) : null + } + control={ +
+ updateSettings({ newWorktreesBaseBranch })} + startFromOrigin={settings.newWorktreesStartFromOrigin} + defaultOption={{ label: gt("Repository default") }} + allowCustomRef + /> +
+ } + /> + ); +} function StartFromRemoteRow() { const gt = useGT(); @@ -69,6 +124,7 @@ export function WorktreesSettingsPanel() { title={gt("Creation", { $context: "settings section about creating worktrees" })} > {!isProjectScope && } + diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index b02f8d2f0b0c8..8651530939252 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -857,6 +857,13 @@ export const SETTINGS_SEARCH_ITEMS = [ scope: "project-defaults", searchTerms: [msg("git submodule init recursive top-level none worktree t3.json")], }, + { + id: "worktree-base-branch", + title: msg("Base branch"), + to: "/settings/worktrees", + scope: "project-defaults", + searchTerms: [msg("new worktrees start from default branch dev main base ref")], + }, { id: "start-from-origin", title: msg("Start from remote"), diff --git a/apps/web/src/i18n/translations/de.json b/apps/web/src/i18n/translations/de.json index 648fd58859dbe..3704c15839864 100644 --- a/apps/web/src/i18n/translations/de.json +++ b/apps/web/src/i18n/translations/de.json @@ -12092,5 +12092,12 @@ "27d76249d09eb69f": "Review-Leitfaden bereit", "faa3bb26abb39c93": "Review-Leitfaden fehlgeschlagen", "b7df38b7d8792d78": "Leitfaden öffnen", - "9e91e9a77b664e4e": "Review-Leitfaden konnte nicht gestartet werden" + "9e91e9a77b664e4e": "Review-Leitfaden konnte nicht gestartet werden", + "4bd759216dc953fc": "Wähle ein Projekt, um seine Branches aufzulisten.", + "4b908ff6bee82250": "\"{ref}\" verwenden", + "ae1db3a86b9b495a": "Der Branch, von dem neue Worktrees starten, etwa dev. Du kannst für jeden Thread weiterhin einen anderen Branch wählen.", + "ba91614d241ab3e5": "Basisbranch auf Standard zurücksetzen", + "a136ae2ffe6eeb7c": "Basisbranch für neue Worktrees", + "a4d45e701fd1ecd6": "Repository-Standard", + "8058cd2d1c61c1e3": "neue Worktrees starten Standardbranch dev main Basis Ref" } diff --git a/apps/web/src/i18n/translations/en.json b/apps/web/src/i18n/translations/en.json index 599944358b5bb..0bc9d20c21ae1 100644 --- a/apps/web/src/i18n/translations/en.json +++ b/apps/web/src/i18n/translations/en.json @@ -12101,5 +12101,12 @@ "27d76249d09eb69f": "Review guide ready", "faa3bb26abb39c93": "Review guide failed", "b7df38b7d8792d78": "Open guide", - "9e91e9a77b664e4e": "Could not start a review guide" + "9e91e9a77b664e4e": "Could not start a review guide", + "4bd759216dc953fc": "Choose a project to list its branches.", + "4b908ff6bee82250": "Use \"{ref}\"", + "ae1db3a86b9b495a": "The branch new worktrees start from, such as dev. You can still pick another branch for each thread.", + "ba91614d241ab3e5": "Reset base branch to default", + "a136ae2ffe6eeb7c": "Base branch for new worktrees", + "a4d45e701fd1ecd6": "Repository default", + "8058cd2d1c61c1e3": "new worktrees start from default branch dev main base ref" } diff --git a/apps/web/src/i18n/translations/es.json b/apps/web/src/i18n/translations/es.json index 956f4e17a9617..67f49dfd1abf0 100644 --- a/apps/web/src/i18n/translations/es.json +++ b/apps/web/src/i18n/translations/es.json @@ -12087,5 +12087,12 @@ "27d76249d09eb69f": "Guía de revisión lista", "faa3bb26abb39c93": "Falló la guía de revisión", "b7df38b7d8792d78": "Abrir guía", - "9e91e9a77b664e4e": "No se pudo iniciar una guía de revisión" + "9e91e9a77b664e4e": "No se pudo iniciar una guía de revisión", + "4bd759216dc953fc": "Elige un proyecto para ver sus ramas.", + "4b908ff6bee82250": "Usar \"{ref}\"", + "ae1db3a86b9b495a": "La rama desde la que parten los nuevos worktrees, como dev. Puedes elegir otra rama para cada hilo.", + "ba91614d241ab3e5": "Restablecer la rama base predeterminada", + "a136ae2ffe6eeb7c": "Rama base para nuevos worktrees", + "a4d45e701fd1ecd6": "Predeterminada del repositorio", + "8058cd2d1c61c1e3": "nuevos worktrees iniciar rama predeterminada dev main base referencia" } diff --git a/apps/web/src/i18n/translations/fr.json b/apps/web/src/i18n/translations/fr.json index 1c982cc6d6f58..39a950bbccdde 100644 --- a/apps/web/src/i18n/translations/fr.json +++ b/apps/web/src/i18n/translations/fr.json @@ -12092,5 +12092,12 @@ "27d76249d09eb69f": "Guide de revue prêt", "faa3bb26abb39c93": "Échec du guide de revue", "b7df38b7d8792d78": "Ouvrir le guide", - "9e91e9a77b664e4e": "Impossible de démarrer un guide de revue" + "9e91e9a77b664e4e": "Impossible de démarrer un guide de revue", + "4bd759216dc953fc": "Choisissez un projet pour afficher ses branches.", + "4b908ff6bee82250": "Utiliser \"{ref}\"", + "ae1db3a86b9b495a": "La branche de départ des nouveaux worktrees, par exemple dev. Vous pouvez toujours choisir une autre branche pour chaque fil.", + "ba91614d241ab3e5": "Réinitialiser la branche de base par défaut", + "a136ae2ffe6eeb7c": "Branche de base des nouveaux worktrees", + "a4d45e701fd1ecd6": "Valeur par défaut du dépôt", + "8058cd2d1c61c1e3": "nouveaux worktrees démarrer branche par défaut dev main base référence" } diff --git a/apps/web/src/i18n/translations/ja.json b/apps/web/src/i18n/translations/ja.json index 879531a396d2a..5053469b062df 100644 --- a/apps/web/src/i18n/translations/ja.json +++ b/apps/web/src/i18n/translations/ja.json @@ -12040,5 +12040,12 @@ "27d76249d09eb69f": "レビューガイドの準備ができました", "faa3bb26abb39c93": "レビューガイドの作成に失敗しました", "b7df38b7d8792d78": "ガイドを開く", - "9e91e9a77b664e4e": "レビューガイドを開始できませんでした" + "9e91e9a77b664e4e": "レビューガイドを開始できませんでした", + "4bd759216dc953fc": "ブランチを表示するプロジェクトを選択してください。", + "4b908ff6bee82250": "\"{ref}\" を使用", + "ae1db3a86b9b495a": "新しいワークツリーの開始元ブランチ(例: dev)。スレッドごとに別のブランチを選択できます。", + "ba91614d241ab3e5": "ベースブランチを既定に戻す", + "a136ae2ffe6eeb7c": "新しいワークツリーのベースブランチ", + "a4d45e701fd1ecd6": "リポジトリの既定", + "8058cd2d1c61c1e3": "新しい ワークツリー 開始 既定 ブランチ dev main ベース 参照" } diff --git a/apps/web/src/i18n/translations/ko.json b/apps/web/src/i18n/translations/ko.json index fae8ce2ec6fc4..2cb33c5743ef5 100644 --- a/apps/web/src/i18n/translations/ko.json +++ b/apps/web/src/i18n/translations/ko.json @@ -12036,5 +12036,12 @@ "27d76249d09eb69f": "검토 가이드 준비됨", "faa3bb26abb39c93": "검토 가이드 실패", "b7df38b7d8792d78": "가이드 열기", - "9e91e9a77b664e4e": "검토 가이드를 시작할 수 없습니다" + "9e91e9a77b664e4e": "검토 가이드를 시작할 수 없습니다", + "4bd759216dc953fc": "브랜치를 나열할 프로젝트를 선택하세요.", + "4b908ff6bee82250": "\"{ref}\" 사용", + "ae1db3a86b9b495a": "새 워크트리의 시작 브랜치입니다(예: dev). 스레드마다 다른 브랜치를 선택할 수 있습니다.", + "ba91614d241ab3e5": "기본 브랜치를 기본값으로 재설정", + "a136ae2ffe6eeb7c": "새 워크트리의 기준 브랜치", + "a4d45e701fd1ecd6": "저장소 기본값", + "8058cd2d1c61c1e3": "새 워크트리 시작 기본 브랜치 dev main 기준 참조" } diff --git a/apps/web/src/i18n/translations/pt-BR.json b/apps/web/src/i18n/translations/pt-BR.json index 7010bef288b16..8fba12e29424f 100644 --- a/apps/web/src/i18n/translations/pt-BR.json +++ b/apps/web/src/i18n/translations/pt-BR.json @@ -12091,5 +12091,12 @@ "27d76249d09eb69f": "Guia de revisão pronto", "faa3bb26abb39c93": "O guia de revisão falhou", "b7df38b7d8792d78": "Abrir guia", - "9e91e9a77b664e4e": "Não foi possível iniciar um guia de revisão" + "9e91e9a77b664e4e": "Não foi possível iniciar um guia de revisão", + "4bd759216dc953fc": "Escolha um projeto para listar suas branches.", + "4b908ff6bee82250": "Usar \"{ref}\"", + "ae1db3a86b9b495a": "A branch de origem dos novos worktrees, como dev. Você ainda pode escolher outra branch para cada conversa.", + "ba91614d241ab3e5": "Redefinir a branch base para o padrão", + "a136ae2ffe6eeb7c": "Branch base para novos worktrees", + "a4d45e701fd1ecd6": "Padrão do repositório", + "8058cd2d1c61c1e3": "novos worktrees iniciar branch padrão dev main base referência" } diff --git a/apps/web/src/i18n/translations/ru.json b/apps/web/src/i18n/translations/ru.json index 0766d953dd02d..7ba332f1d8fcd 100644 --- a/apps/web/src/i18n/translations/ru.json +++ b/apps/web/src/i18n/translations/ru.json @@ -12091,5 +12091,12 @@ "27d76249d09eb69f": "Гид по ревью готов", "faa3bb26abb39c93": "Не удалось создать гид по ревью", "b7df38b7d8792d78": "Открыть гид", - "9e91e9a77b664e4e": "Не удалось запустить гид по ревью" + "9e91e9a77b664e4e": "Не удалось запустить гид по ревью", + "4bd759216dc953fc": "Выберите проект, чтобы увидеть его ветки.", + "4b908ff6bee82250": "Использовать \"{ref}\"", + "ae1db3a86b9b495a": "Ветка, от которой создаются новые рабочие деревья, например dev. Для каждого треда можно выбрать другую ветку.", + "ba91614d241ab3e5": "Сбросить базовую ветку по умолчанию", + "a136ae2ffe6eeb7c": "Базовая ветка для новых рабочих деревьев", + "a4d45e701fd1ecd6": "По умолчанию в репозитории", + "8058cd2d1c61c1e3": "новые рабочие деревья начало ветка по умолчанию dev main базовая ссылка" } diff --git a/apps/web/src/i18n/translations/sv.json b/apps/web/src/i18n/translations/sv.json index 5e6d1607edf31..fe9be2d89b095 100644 --- a/apps/web/src/i18n/translations/sv.json +++ b/apps/web/src/i18n/translations/sv.json @@ -12099,5 +12099,12 @@ "27d76249d09eb69f": "Granskningsguiden är klar", "faa3bb26abb39c93": "Granskningsguiden misslyckades", "b7df38b7d8792d78": "Öppna guiden", - "9e91e9a77b664e4e": "Kunde inte starta en granskningsguide" + "9e91e9a77b664e4e": "Kunde inte starta en granskningsguide", + "4bd759216dc953fc": "Välj ett projekt för att visa dess grenar.", + "4b908ff6bee82250": "Använd \"{ref}\"", + "ae1db3a86b9b495a": "Grenen som nya worktrees utgår från, till exempel dev. Du kan fortfarande välja en annan gren för varje tråd.", + "ba91614d241ab3e5": "Återställ basgrenen till standard", + "a136ae2ffe6eeb7c": "Basgren för nya worktrees", + "a4d45e701fd1ecd6": "Kodförrådets standard", + "8058cd2d1c61c1e3": "nya worktrees starta standardgren dev main bas referens" } diff --git a/apps/web/src/i18n/translations/zh.json b/apps/web/src/i18n/translations/zh.json index c86b9e6c55e41..0d6116d47cc24 100644 --- a/apps/web/src/i18n/translations/zh.json +++ b/apps/web/src/i18n/translations/zh.json @@ -12117,5 +12117,12 @@ "27d76249d09eb69f": "审查导览已就绪", "faa3bb26abb39c93": "审查导览生成失败", "b7df38b7d8792d78": "打开导览", - "9e91e9a77b664e4e": "无法开始生成审查导览" + "9e91e9a77b664e4e": "无法开始生成审查导览", + "4bd759216dc953fc": "选择一个项目以列出其分支。", + "4b908ff6bee82250": "使用 \"{ref}\"", + "ae1db3a86b9b495a": "新工作树的起始分支,例如 dev。你仍然可以为每个会话选择其他分支。", + "ba91614d241ab3e5": "将基础分支重置为默认值", + "a136ae2ffe6eeb7c": "新工作树的基础分支", + "a4d45e701fd1ecd6": "仓库默认值", + "8058cd2d1c61c1e3": "新建 工作树 起始 默认 分支 dev main 基础 引用" } diff --git a/apps/web/src/lib/chatThreadActions.test.ts b/apps/web/src/lib/chatThreadActions.test.ts index ad465cd06b2bf..727433b072b16 100644 --- a/apps/web/src/lib/chatThreadActions.test.ts +++ b/apps/web/src/lib/chatThreadActions.test.ts @@ -1,6 +1,9 @@ import { ProviderInstanceId, type ModelSelection } from "@t3tools/contracts"; import { describe, expect, it } from "vite-plus/test"; -import { resolveNewThreadModelSelectionOverride } from "./chatThreadActions"; +import { + resolveNewThreadModelSelectionOverride, + shouldResetBranchForNewWorktree, +} from "./chatThreadActions"; const PROJECT_DEFAULT_SELECTION: ModelSelection = { instanceId: ProviderInstanceId.make("codex"), @@ -34,3 +37,34 @@ describe("chatThreadActions", () => { ).toEqual(PROJECT_DEFAULT_SELECTION); }); }); + +describe("shouldResetBranchForNewWorktree", () => { + const input = { + currentEnvMode: "local", + nextEnvMode: "worktree", + worktreeBaseBranch: "dev", + } as const; + + it("starts a new worktree from the configured base instead of the checkout's branch", () => { + expect(shouldResetBranchForNewWorktree(input)).toBe(true); + }); + + it("leaves the branch to fill while settings are still loading", () => { + expect(shouldResetBranchForNewWorktree({ ...input, worktreeBaseBranch: null })).toBe(true); + }); + + it("keeps a base already picked in worktree mode", () => { + expect(shouldResetBranchForNewWorktree({ ...input, currentEnvMode: "worktree" })).toBe(false); + }); + + it("keeps today's behavior without a configured base or when leaving worktree mode", () => { + expect(shouldResetBranchForNewWorktree({ ...input, worktreeBaseBranch: "" })).toBe(false); + expect( + shouldResetBranchForNewWorktree({ + currentEnvMode: "worktree", + nextEnvMode: "local", + worktreeBaseBranch: "dev", + }), + ).toBe(false); + }); +}); diff --git a/apps/web/src/lib/chatThreadActions.ts b/apps/web/src/lib/chatThreadActions.ts index 2c52a3f56239e..f61f61eea8a87 100644 --- a/apps/web/src/lib/chatThreadActions.ts +++ b/apps/web/src/lib/chatThreadActions.ts @@ -44,6 +44,22 @@ export function resolveNewDraftStartFromOrigin(input: { return input.envMode === "worktree" && input.newWorktreesStartFromOrigin; } +/** + * A checkout's branch is not a worktree base, so leaving it for a new worktree starts from the + * configured base. A null base means settings have not loaded, so the branch is left to fill. + */ +export function shouldResetBranchForNewWorktree(input: { + currentEnvMode: DraftThreadEnvMode | undefined; + nextEnvMode: DraftThreadEnvMode; + worktreeBaseBranch: string | null; +}): boolean { + return ( + input.currentEnvMode === "local" && + input.nextEnvMode === "worktree" && + input.worktreeBaseBranch !== "" + ); +} + export function resolveNewThreadModelSelectionOverride(input: { readonly projectDefaultSelection: ModelSelection | null; readonly carrySelection: ModelSelection | null; diff --git a/docs/user/project-settings.md b/docs/user/project-settings.md index 84ffbbebd5a4d..f2df4abca7cd5 100644 --- a/docs/user/project-settings.md +++ b/docs/user/project-settings.md @@ -64,6 +64,14 @@ back. On mobile, both are in **Settings → Projects → Organize**. A project on several machines must have every machine connected to pin or archive it. +## Worktree base branch + +New worktrees start from the repository's default branch. If a project's work branches +from somewhere else, such as `dev`, select the project and pick that branch in +**Settings → Worktrees → Base branch**. To use a tag or commit, type it in the picker's +search. Choose **Repository default** to go back. You can still choose a different base +for any single thread from the branch picker. + ## Worktree branch names In **Settings → Worktrees → Worktree branch naming**, choose a static prefix, diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 678f58294c66a..625929bc807a2 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -1176,6 +1176,7 @@ export const PROJECT_SCOPED_SERVER_SETTING_KEYS = [ "defaultRuntimeMode", "defaultThreadEnvMode", "newWorktreesStartFromOrigin", + "newWorktreesBaseBranch", "worktreeSubmodules", "defaultAutoPull", "defaultProjectScripts", @@ -1214,6 +1215,7 @@ export const ProjectSettingsOverrides = Schema.Struct({ defaultRuntimeMode: Schema.optionalKey(RuntimeMode), defaultThreadEnvMode: Schema.optionalKey(ThreadEnvMode), newWorktreesStartFromOrigin: Schema.optionalKey(Schema.Boolean), + newWorktreesBaseBranch: Schema.optionalKey(TrimmedString), worktreeSubmodules: ForwardCompatibleOptional(WorktreeSubmodules), defaultAutoPull: Schema.optionalKey(Schema.Boolean), defaultProjectScripts: Schema.optionalKey(Schema.Array(ProjectScript)), @@ -1522,6 +1524,8 @@ export const ServerSettings = Schema.Struct({ newWorktreesStartFromOrigin: Schema.Boolean.pipe( Schema.withDecodingDefault(Effect.succeed(true)), ), + /** Empty uses the repository's default branch. */ + newWorktreesBaseBranch: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))), /** Null inherits t3.json, then recursive; unknown values decode to null for older clients. */ worktreeSubmodules: ForwardCompatibleNullable(WorktreeSubmodules).pipe( Schema.withDecodingDefault(Effect.succeed(null)), @@ -1936,6 +1940,7 @@ export const ServerSettingsPatch = Schema.Struct({ environmentIcon: Schema.optionalKey(Schema.NullOr(EnvironmentMachineKind)), defaultThreadEnvMode: Schema.optionalKey(Schema.NullOr(ThreadEnvMode)), newWorktreesStartFromOrigin: Schema.optionalKey(Schema.Boolean), + newWorktreesBaseBranch: Schema.optionalKey(TrimmedString), worktreeSubmodules: Schema.optionalKey(Schema.NullOr(WorktreeSubmodules)), addProjectBaseDirectory: Schema.optionalKey(TrimmedString), ghqCloneLayout: Schema.optionalKey(Schema.Boolean), diff --git a/packages/shared/src/projectSettings.test.ts b/packages/shared/src/projectSettings.test.ts index a5edf854c3aec..4d1937be01bf2 100644 --- a/packages/shared/src/projectSettings.test.ts +++ b/packages/shared/src/projectSettings.test.ts @@ -34,6 +34,18 @@ describe("resolveSendEnvMode", () => { }); describe("resolveProjectSettings", () => { + it("lets a project return to the repository default when its environment sets a base branch", () => { + const settings = { + ...DEFAULT_SERVER_SETTINGS, + newWorktreesBaseBranch: "dev", + projectSettingsOverrides: { [projectId]: { newWorktreesBaseBranch: "" } }, + }; + expect(resolveProjectSettings(settings, projectId).settings.newWorktreesBaseBranch).toBe(""); + expect(resolveProjectSettings(settings, otherProjectId).settings.newWorktreesBaseBranch).toBe( + "dev", + ); + }); + it("ignores an override left undefined by a forward-compatible decode", () => { const resolved = resolveProjectSettings( {