Skip to content

fix: prevent PR targeting same branch and duplicated prefix #244

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
rubenmarcus merged 2 commits into from
Feb 23, 2026
Merged

fix: prevent PR targeting same branch and duplicated prefix #244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3d632
fix: PR creation targeting same branch and duplicated feat: prefix (#…
rubenmarcus Feb 23, 2026
04e39e6
fix: align commit message regex with PR title regex and clarify fallback
rubenmarcus Feb 23, 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
17 changes: 17 additions & 0 deletions src/automation/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,23 @@ export async function getCurrentBranch(cwd: string): Promise<string> {
return branch.trim();
}

export async function getDefaultBranch(cwd: string): Promise<string> {
try {
const { stdout } = await execa('git', ['symbolic-ref', 'refs/remotes/origin/HEAD', '--short'], {
cwd,
});
// Returns e.g. "origin/main" — strip the "origin/" prefix
return stdout.trim().replace(/^origin\//, '');
} catch {
// Fallback: check if main or master exists
const git: SimpleGit = simpleGit({ baseDir: cwd });
const branches = await git.branchLocal();
if (branches.all.includes('main')) return 'main';
if (branches.all.includes('master')) return 'master';
return 'main'; // Final fallback
}
}

export async function createBranch(cwd: string, branchName: string): Promise<void> {
const git: SimpleGit = simpleGit({ baseDir: cwd });
await git.checkoutLocalBranch(branchName);
Expand Down
13 changes: 10 additions & 3 deletions src/loop/task-executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
createBranch,
createPullRequest,
getCurrentBranch,
getDefaultBranch,
gitCommit,
gitPush,
hasUncommittedChanges,
Expand Down Expand Up @@ -91,6 +92,7 @@ export async function executeTaskBatch(options: TaskExecutionOptions): Promise<T

const results: TaskResult[] = [];
const originalBranch = await getCurrentBranch(cwd);
const defaultBranch = await getDefaultBranch(cwd);
let previousBranch = originalBranch; // Track for cascading PRs

for (let i = 0; i < tasks.length; i++) {
Expand Down Expand Up @@ -154,11 +156,16 @@ export async function executeTaskBatch(options: TaskExecutionOptions): Promise<T

if (pr) {
// Create PR with cascading base:
// First PR targets original branch (main)
// First PR targets the default branch (main/master)
// Subsequent PRs target the previous auto branch
const prBase = i === 0 ? originalBranch : previousBranch;
const prBase = i === 0 ? defaultBranch : previousBranch;
// Strip existing conventional commit prefix to avoid duplication (e.g. "feat: feat:")
const cleanTitle = task.title.replace(
/^(feat|fix|chore|docs|refactor|test|style|ci|perf|build):\s*/i,
''
);
const prUrl = await createPullRequest(cwd, {
title: `feat: ${task.title}`,
title: `feat: ${cleanTitle}`,
body: buildPrBody(task, result, prBase),
base: prBase,
});
Expand Down
Loading