BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(worktree): restore last source branch reliably (#2030)

Browse Source 
* fix(worktree): restore last source branch reliably

* chore: retrigger review

---------

Co-authored-by: bashrusakh <bashrusakh@users.noreply.github.com>
This commit is contained in:
Leonid
2026-07-11 16:01:30 +03:00
committed by GitHub
co-authored by bashrusakh
parent 0d4118e87a
commit e5bba59a75
4 changed files with 210 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/components/multirun/BranchSelector.tsx
+30 -15
View File
@@ -12,11 +12,12 @@ import {
import { useGitStore, useGitBranches, useGitLoadingBranches, useGitLoadingStatus, useIsGitRepo } from '@/stores/useGitStore';
import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
import { getRootBranch } from '@/lib/worktrees/worktreeStatus';
import {
LAST_WORKTREE_SOURCE_BRANCH_KEY,
resolveWorktreeSourceBranchPreference,
} from '@/lib/worktrees/worktreeSourceBranchPreference';
import { useI18n } from '@/lib/i18n';
/** localStorage key matching NewWorktreeDialog */
const LAST_SOURCE_BRANCH_KEY = 'oc:lastWorktreeSourceBranch';
export interface BranchSelectorProps {
/** Current directory to check for git repository */
directory: string | null;
@@ -117,24 +118,35 @@ export const BranchSelector: React.FC<BranchSelectorProps> = ({
// Resolve default source branch (same priority as NewWorktreeDialog)
React.useEffect(() => {
if (disabled || isLoading || allBranches.length === 0) return;
// If current value is valid, keep it
if (value && allBranches.includes(value)) return;
const currentValue = value;
let cancelled = false;
const resolve = async () => {
try {
const rootBranch = directory ? await getRootBranch(directory).catch(() => null) : null;
const saved = localStorage.getItem(LAST_SOURCE_BRANCH_KEY);
if (cancelled) return;
if (saved && allBranches.includes(saved)) {
onChange(saved);
} else if (rootBranch && allBranches.includes(rootBranch)) {
onChange(rootBranch);
} else if (allBranches.includes('main')) {
onChange('main');
} else if (allBranches.includes('master')) {
onChange('master');
} else if (allBranches[0]) {
onChange(allBranches[0]);
const saved = localStorage.getItem(LAST_WORKTREE_SOURCE_BRANCH_KEY);
const {
sourceBranch,
shouldClearSavedSourceBranch,
} = resolveWorktreeSourceBranchPreference({
branches: allBranches,
savedSourceBranch: saved,
rootBranch,
});
if (shouldClearSavedSourceBranch) {
localStorage.removeItem(LAST_WORKTREE_SOURCE_BRANCH_KEY);
}
if (cancelled || (currentValue && allBranches.includes(currentValue))) return;
if (sourceBranch) {
onChange(sourceBranch);
}
} catch {
// ignore
@@ -142,6 +154,9 @@ export const BranchSelector: React.FC<BranchSelectorProps> = ({
};
void resolve();
return () => {
cancelled = true;
};
}, [allBranches, directory, disabled, isLoading, onChange, value]);
const isDisabled = disabled || !isGitRepository || isLoading;