feat(FN-3419): remove inline lock indicator from PlanningModeModal
Removed the inline lock indicator from PlanningModeModal and added a new test file covering the planning flow behavior. Fusion-Task-Id: FN-3419
This commit is contained in:
@@ -2582,6 +2582,13 @@ export async function aiMergeTask(
|
||||
): Promise<MergeResult> {
|
||||
throwIfAborted(options.signal, taskId);
|
||||
|
||||
// 1. Validate task state
|
||||
const task = await store.getTask(taskId);
|
||||
const mergeBlocker = getTaskMergeBlocker(task);
|
||||
if (mergeBlocker) {
|
||||
throw new Error(`Cannot merge ${taskId}: ${mergeBlocker}`);
|
||||
}
|
||||
|
||||
// Pre-merge guard against the common single-checkout setup where rootDir
|
||||
// is the developer's working tree. The merge flow below issues several
|
||||
// `git reset --hard/--merge` calls and forced checkouts that would
|
||||
@@ -2591,13 +2598,6 @@ export async function aiMergeTask(
|
||||
const autostashRef = await stashUnrelatedRootDirChanges(rootDir, taskId);
|
||||
try {
|
||||
|
||||
// 1. Validate task state
|
||||
const task = await store.getTask(taskId);
|
||||
const mergeBlocker = getTaskMergeBlocker(task);
|
||||
if (mergeBlocker) {
|
||||
throw new Error(`Cannot merge ${taskId}: ${mergeBlocker}`);
|
||||
}
|
||||
|
||||
const branch = task.branch || `fusion/${taskId.toLowerCase()}`;
|
||||
const sourceIssueRef = buildSourceIssueRef(task.sourceIssue);
|
||||
const worktreePath = task.worktree;
|
||||
|
||||
Reference in New Issue
Block a user