ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-18 10:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Address code review comments

Browse Source
This commit is contained in:
gsxdsm
2026-02-16 11:53:09 -08:00
parent eed5e20438
commit 462dbf1522
12 changed files with 147 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/server/src/services/execution-service.ts
View File

@@ -190,9 +190,9 @@ ${feature.spec}
}
}
let worktreePath: string | null = null;
let worktreePath: string | null = providedWorktreePath ?? null;
const branchName = feature.branchName;
if (useWorktrees && branchName) {
if (!worktreePath && useWorktrees && branchName) {
worktreePath = await this.worktreeResolver.findWorktreeForBranch(projectPath, branchName);
if (worktreePath) logger.info(`Using worktree for branch "${branchName}": ${worktreePath}`);
}
@@ -289,6 +289,11 @@ ${feature.spec}
testAttempts: 0,
maxTestAttempts: 5,
});
// Check if pipeline set a terminal status (e.g., merge_conflict) — don't overwrite it
const refreshed = await this.loadFeatureFn(projectPath, featureId);
if (refreshed?.status === 'merge_conflict') {
return;
}
}
const finalStatus = feature.skipTests ? 'waiting_approval' : 'verified';