Skip to content

feat: default worktree directory to parent of agent's cwd #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jSydorowicz21 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: default worktree directory to parent of agent's cwd #557

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b25e6c1
feat: default worktree directory to parent of agent's working directory
jSydorowicz21 Mar 11, 2026
504889f
refactor: extract getParentDir helper to reduce duplicated regex logic
jSydorowicz21 Mar 11, 2026
b952a0d
fix: address review feedback for worktree default directory
jSydorowicz21 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/renderer/components/WorktreeConfigModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ interface WorktreeConfigModalProps {
onDisableConfig: () => void;
}

/** Get parent directory from a path (works with both / and \ separators) */
function getParentDir(path: string): string {
const parent = path.replace(/[/\\][^/\\]+$/, '');
return parent || path; // keep original if we're already at root
}

/**
* Validates that a directory exists (works over SSH for remote sessions)
*/
Expand Down Expand Up @@ -49,14 +55,16 @@ export function WorktreeConfigModal({
const onCloseRef = useRef(onClose);
onCloseRef.current = onClose;

// Form state
const [basePath, setBasePath] = useState(session.worktreeConfig?.basePath || '');
// Form state — default base path to parent directory of the agent's cwd
const [basePath, setBasePath] = useState(
session.worktreeConfig?.basePath || getParentDir(session.cwd)
);
const [watchEnabled, setWatchEnabled] = useState(session.worktreeConfig?.watchEnabled ?? true);
const [newBranchName, setNewBranchName] = useState('');
const [isCreating, setIsCreating] = useState(false);
const [isValidating, setIsValidating] = useState(false);
const [error, setError] = useState<string | null>(null);
const canDisable = !!(session.worktreeConfig?.basePath || basePath.trim());
const canDisable = !!session.worktreeConfig?.basePath;

// gh CLI status
const [ghCliStatus, setGhCliStatus] = useState<GhCliStatus | null>(null);
Expand Down Expand Up @@ -86,12 +94,12 @@ export function WorktreeConfigModal({
useEffect(() => {
if (isOpen) {
checkGhCli();
setBasePath(session.worktreeConfig?.basePath || '');
setBasePath(session.worktreeConfig?.basePath || getParentDir(session.cwd));
setWatchEnabled(session.worktreeConfig?.watchEnabled ?? true);
setNewBranchName('');
setError(null);
}
}, [isOpen, session.worktreeConfig]);
}, [isOpen, session.worktreeConfig, session.cwd]);

const checkGhCli = async () => {
try {
Expand Down