From 80b47b93b3cbf0617a7e49dbcff7d2d3ae3541bb Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 16 Nov 2026 21:02:56 +0000 Subject: [PATCH] fix: preserve foreign live lanes during stack capture --- CHANGELOG.md | 4 + README.md | 9 +- VERSION | 2 +- docs/ai-agents.md | 9 +- docs/index.html | 4 +- openpack.json | 2 +- scripts/syncwheel.py | 12 +- scripts/syncwheel_worktrees.py | 44 ++++++- skills/syncwheel/SKILL.md | 5 +- tests/test_foreign_live_capture.py | 200 +++++++++++++++++++++++++++++ 10 files changed, 280 insertions(+), 11 deletions(-) create mode 100644 tests/test_foreign_live_capture.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 14348b6f..76bdeec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.47.19 - 2026-11-16 + +- Preserve another owner's live lane during stack capture and automatic cleanup. Record the stack ownership without changing the protected lane's lease, checkout, index or refs, and report which owner is keeping it. Unproven foreign lease expiry also preserves the lane. + ## 0.47.18 - 2026-11-16 - Name path-scoped stack absorb with a new commit for uncommitted primary changes, reserving capture-integration for existing unowned commits. Refuse default amend on an empty stack before changing its base, metadata or worktrees. An empty recipe whose branch has moved from the base also refuses a new-commit absorb, preserving its undeclared history. diff --git a/README.md b/README.md index d462193b..0cf784a3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Keep many long-lived pull requests clean, rebuildable, and publishable from one manifest. -Current version: `0.47.18` +Current version: `0.47.19` `syncwheel` is a small CLI and workflow model for maintainers who carry several PR branches against an upstream repository and need those branches to stay @@ -401,7 +401,12 @@ lease, base, branch, target stack, mode, and any recovery ref in Git's common directory, never in the shared manifest. Use `--into ` when the destination is already known. Otherwise, after committing, use the existing `stack create`, `stack add`, or `stack capture-integration` workflow from a -different clean checkout. Once a stack owns every lane commit, Syncwheel anchors +different clean checkout. Capturing commits from another owner's lane with a live +lease records stack ownership and reports `captured, kept: owner live`. +The lane stays active with its lease, checkout, index and refs unchanged; an +unproven foreign lease expiry is also retained. Coordinate explicit release with +its owner instead of treating capture as permission to remove their checkout. +For an eligible lane, once a stack owns every lane commit, Syncwheel anchors the lane tip under `refs/syncwheel/recovery/lanes/...` and pushes the same tip to `refs/syncwheel/archive/lanes/...` on the publication remote (or the canonical remote when the publication one is not configured) before reaping diff --git a/VERSION b/VERSION index be481122..9e8eba07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.47.18 +0.47.19 diff --git a/docs/ai-agents.md b/docs/ai-agents.md index 48d59d0b..f749c9fb 100644 --- a/docs/ai-agents.md +++ b/docs/ai-agents.md @@ -240,6 +240,10 @@ active-active channel must use the coordination remote. and pushed to `refs/syncwheel/archive/lanes/...` on the publication remote, before reaping even if its registry path is outside the current root, while an existing dirty or unknown lane must remain visible until explicitly handled +- capturing commits does not authorize removing another owner's live lane. + Keep its active state and lease, and coordinate an explicit release with its + owner when the command reports `captured, kept`. Unproven lease expiry also + retains a foreign lane - preview `worktree release --reason ` before using `--apply` for a dead or abandoned lane; apply records the reason in the ledger and refuses an existing dirty worktree with its recovery remedy @@ -252,8 +256,9 @@ active-active channel must use the coordination remote. live users and foreign locks still stop cleanup; never release another owner's lane merely because its warning is visible - use `--dry-run` when inspecting rebuild/push commands -- prefer `reconcile` for the normal multi-device lifecycle; use raw Git only as - inspection or fallback +- prefer `reconcile` for the normal multi-device lifecycle. Raw Git is for + inspection; there is no raw-push fallback. Stop and report a Syncwheel refusal + instead of bypassing it - for an active-active manifest, use `handoff` before taking over from another device or agent; never bypass the coordinated publisher with `git push` - when a publication or revision-provider check is blocked by another stack's diff --git a/docs/index.html b/docs/index.html index a7eab148..7300624c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1826,7 +1826,7 @@
- AI-ready Git coordination v0.47.18 + AI-ready Git coordination v0.47.19

Move atmachine speed.Stay in control.

Syncwheel coordinates every Git lane used by humans, AI agents, CI and delivery systems—without sacrificing review, safety or recovery.

@@ -2602,7 +2602,7 @@

Your first verified plan in minutes.