FN-078: repair multi-repository workspace merge coordination
Keep long-running workspace land operations live and enforce repository-local scope isolation.
- Renew workspace land leases throughout dependency sync, AI merge, push, and intent resolution.
- Abort stale land bodies before durable or remote commit points and fence lease-dependent writes.
- Centralize repository File Scope resolution across squash, completion, and checkout guards.
- Add regression coverage, architecture documentation, and a patch changeset.
Files changed:
.changeset/fn-078-workspace-lease-and-scope.md | 7 +
docs/architecture.md | 3 +-
.../executor-workspace-main-checkout-guard.test.ts | 13 ++
.../__tests__/executor-workspace-taskdone.test.ts | 21 +++
.../src/__tests__/workspace-merger-lease.test.ts | 195 ++++++++++++++++++++-
.../src/executor/workspace-main-checkout-guard.ts | 4 +-
.../src/executor/worktree-task-done-scope-leak.ts | 4 +-
.../engine/src/merge/merger-ai-squash-gates.ts | 9 +-
packages/engine/src/merge/merger-ai.ts | 55 +++++-
packages/engine/src/worktree/workspace-paths.ts | 26 +++
10 files changed, 321 insertions(+), 16 deletions(-)
Fusion-Task-Id: FN-078
Fusion-Task-Lineage: 8ddfa438-d6c0-4d3a-972a-3594bfc05ffb
Co-authored-by: Fusion <noreply@runfusion.ai>
926dda6fc7