root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(FN-4350): complete Step 4 — pass verification gates

Browse Source 
Fusion-Task-Id: FN-4350
Fusion-Task-Lineage: 11fff2c2-1cd1-4562-9b01-032a15217479
This commit is contained in:
Fusion
2026-05-13 12:20:55 -07:00
committed by gsxdsm
parent 22fee60aee
commit 9f14fa51ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/engine/src/executor.ts
View File

@@ -6350,7 +6350,7 @@ and show an appropriate message to the user.\`
await this.store.updateTask(task.id, { worktree: livePath, branch }); await this.store.updateTask(task.id, { worktree: livePath, branch });
const message = `[recovery] reclaimed existing worktree for ${task.id} at ${livePath} (${count} commits preserved, tip ${tipSha.slice(0, 12)})`; const message = `[recovery] reclaimed existing worktree for ${task.id} at ${livePath} (${count} commits preserved, tip ${tipSha.slice(0, 12)})`;
await this.store.logEntry(task.id, message, undefined, this.currentRunContext); await this.store.logEntry(task.id, message, undefined, this.currentRunContext);
await this.store.appendAgentLog(task.id, "Branch conflict auto-recovery", "info", message, "executor"); await this.store.appendAgentLog(task.id, "Branch conflict auto-recovery", "text", message, "executor");
} }
private async handleBranchConflict(task: Task, error: BranchConflictError): Promise<"retry" | "reclaimed" | "sticky"> { private async handleBranchConflict(task: Task, error: BranchConflictError): Promise<"retry" | "reclaimed" | "sticky"> {
@@ -6365,7 +6365,7 @@ and show an appropriate message to the user.\`
if (inspection.kind === "stale-resolved") { if (inspection.kind === "stale-resolved") {
const message = `[recovery] ${task.id} stage-A: pruned stale admin entry for ${error.branchName}`; const message = `[recovery] ${task.id} stage-A: pruned stale admin entry for ${error.branchName}`;
await this.store.logEntry(task.id, message, undefined, this.currentRunContext); await this.store.logEntry(task.id, message, undefined, this.currentRunContext);
await this.store.appendAgentLog(task.id, "Branch conflict auto-recovery", "info", message, "executor"); await this.store.appendAgentLog(task.id, "Branch conflict auto-recovery", "text", message, "executor");
return "retry"; return "retry";
} }