Skip to content

Simplify worktree path uniqueness handling #19

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

Merged
merged 1 commit into from
Oct 25, 2025
Merged

Simplify worktree path uniqueness handling #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 4 additions & 15 deletions main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,15 +322,15 @@ async function createWorktree(projectDir: string, parentBranch: string, sessionN
const worktreesBaseDir = getWorktreeBaseDir();
const projectWorktreeDir = path.join(worktreesBaseDir, projectDirName);
const worktreeName = customBranchName || `session${sessionNumber}`;
const worktreePath = path.join(projectWorktreeDir, worktreeName);
let worktreePath = path.join(projectWorktreeDir, worktreeName);

// Use custom branch name if provided, otherwise generate default
let branchName: string;
const shortUuid = sessionUuid.split('-')[0];
if (customBranchName) {
branchName = customBranchName;
} else {
// Include short UUID to ensure branch uniqueness across deletes/recreates
const shortUuid = sessionUuid.split('-')[0];
branchName = `fleetcode/${worktreeName}-${shortUuid}`;
}

Expand All @@ -343,20 +343,9 @@ async function createWorktree(projectDir: string, parentBranch: string, sessionN
fs.writeFileSync(markerFile, projectDir, "utf-8");
}

// Check if worktree already exists and remove it
// Append short UUID to worktree path to ensure uniqueness
if (fs.existsSync(worktreePath)) {
try {
await git.raw(["worktree", "remove", worktreePath, "--force"]);
} catch (error) {
console.error("Error removing existing worktree:", error);
}
}

// Delete the branch if it exists
try {
await git.raw(["branch", "-D", branchName]);
} catch (error) {
// Branch doesn't exist, that's fine
worktreePath += `-${shortUuid}`;
}

// Create new worktree with a new branch from parent branch
Expand Down