feat(FN-3827): sweep stale autostashes after merge completion

Merger now properly cleans up autostash git refs that survive past their useful lifetime, fixing race conditions during restore/cleanup and adding scheduled stale-sweep runs in the engine. The feature includes docs for the autostash lifecycle, new test coverage for the cleanup and sweep paths, and a Fusion-Task-Id: FN-3827
2026-05-09 18:41:50 -07:00
parent 46404f6a2b
commit 4c46b76fc1
9 changed files with 355 additions and 3 deletions
--- a/packages/core/src/settings-schema.ts
+++ b/packages/core/src/settings-schema.ts
@@ -201,6 +201,7 @@ export const DEFAULT_PROJECT_SETTINGS = {
  defaultPresetBySize: {},
  autoResolveConflicts: true,
  smartConflictResolution: true,
+  mergerAutostashMaxAgeHours: 24,
  worktreeRebaseBeforeMerge: true,
  worktreeRebaseRemote: "",
  worktreeRebaseLocalBase: true,