worktree-controller 1.32.9__tar.gz → 1.32.11__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/PKG-INFO +5 -5
  2. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/README.md +4 -4
  3. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/operations.md +38 -0
  4. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/reference.md +20 -0
  5. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/roadmap.md +2 -1
  6. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/pyproject.toml +1 -1
  7. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/pyproject.toml.orig +1 -1
  8. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/__init__.py +1 -1
  9. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/controller.py +1 -1
  10. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/lifecycle.py +13 -2
  11. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/store.py +93 -0
  12. {worktree_controller-1.32.9 → worktree_controller-1.32.11/src/worktree_controller}/tool_cli_contract.json +1 -1
  13. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/transaction_scope.py +58 -0
  14. {worktree_controller-1.32.9/src/worktree_controller → worktree_controller-1.32.11}/tool_cli_contract.json +1 -1
  15. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/LICENSE +0 -0
  16. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/architecture.md +0 -0
  17. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/client-integration.md +0 -0
  18. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/daily-workflow.md +0 -0
  19. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/first-change.md +0 -0
  20. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/getting-started.md +0 -0
  21. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/integration-boundaries.md +0 -0
  22. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/publishing.md +0 -0
  23. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/docs/scope.md +0 -0
  24. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/examples/change_task.py +0 -0
  25. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/examples/client_continuation.py +0 -0
  26. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/examples/quickstart.py +0 -0
  27. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/activation_layout.py +0 -0
  28. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/branch_retirement.py +0 -0
  29. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/canonical_refresh.py +0 -0
  30. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/canonical_transition.py +0 -0
  31. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/cleanup_attempts.py +0 -0
  32. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/cleanup_evidence.py +0 -0
  33. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/cleanup_recovery.py +0 -0
  34. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/cli.py +0 -0
  35. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/convergence.py +0 -0
  36. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/delivered_closeout.py +0 -0
  37. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/disposable.py +0 -0
  38. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/environment.py +0 -0
  39. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/frozen_recovery.py +0 -0
  40. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/git_backend.py +0 -0
  41. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/governance.py +0 -0
  42. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/hardlinks.py +0 -0
  43. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/integration_cleanup.py +0 -0
  44. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/integration_conflict.py +0 -0
  45. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/integration_retry.py +0 -0
  46. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/keyed_document_scope.py +0 -0
  47. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/lifecycle_history.py +0 -0
  48. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/lifecycle_observation.py +0 -0
  49. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/metadata_codec.py +0 -0
  50. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/metadata_relocation.py +0 -0
  51. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/models.py +0 -0
  52. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/mount_diagnostics.py +0 -0
  53. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/multiple_cleanup_recovery.py +0 -0
  54. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/namespace_migration.py +0 -0
  55. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/native_session_recovery.py +0 -0
  56. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/owner_actions.py +0 -0
  57. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/policy.py +0 -0
  58. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/preservation.py +0 -0
  59. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/preserved_cleanup.py +0 -0
  60. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/publication_execution.py +0 -0
  61. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/reconciler.py +0 -0
  62. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/record_updates.py +0 -0
  63. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/recovery_guidance.py +0 -0
  64. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/registration_backfill.py +0 -0
  65. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/registration_prune.py +0 -0
  66. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/release_intents.py +0 -0
  67. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/rendering.py +0 -0
  68. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/resource_admission.py +0 -0
  69. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/retirement_adapters.py +0 -0
  70. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/retirement_execution.py +0 -0
  71. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/semantics.py +0 -0
  72. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/session.py +0 -0
  73. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/session_admission.py +0 -0
  74. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/source_cleanup.py +0 -0
  75. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/source_preservation.py +0 -0
  76. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/source_recovery.py +0 -0
  77. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/task_workflow.py +0 -0
  78. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/writer_lease.py +0 -0
  79. {worktree_controller-1.32.9 → worktree_controller-1.32.11}/src/worktree_controller/writer_session.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: worktree-controller
3
- Version: 1.32.9
3
+ Version: 1.32.11
4
4
  Summary: Govern Git worktree budgets, authority, ownership, and lifecycle
5
5
  License-Expression: Apache-2.0
6
6
  License-File: LICENSE
@@ -23,7 +23,7 @@ It checks repository policy before allocating a worktree, grants writing authori
23
23
  process, and records handoff, integration, recovery and release evidence. Git remains the source
24
24
  of truth for files, branches, commits and registered worktrees.
25
25
 
26
- **Current release: 1.32.9 · Linux · Python 3.12 · Apache-2.0**
26
+ **Current release: 1.32.11 · Linux · Python 3.12 · Apache-2.0**
27
27
 
28
28
  ## Install
29
29
 
@@ -32,7 +32,7 @@ Use a virtual environment in a new directory:
32
32
  ```bash
33
33
  python3.12 -m venv .venv
34
34
  . .venv/bin/activate
35
- python -m pip install worktree-controller==1.32.9
35
+ python -m pip install worktree-controller==1.32.11
36
36
  worktree-controller --version
37
37
  worktree-controller capabilities --json
38
38
  ```
@@ -41,7 +41,7 @@ WC requires Git and readable Linux `/proc`. Other operating systems and Python v
41
41
  supported by this release. Its one runtime dependency is `websockets>=15,<16`.
42
42
  On Ubuntu, if creating the environment reports that `ensurepip` is unavailable, install the
43
43
  distribution's `python3.12-venv` package first (for example, `sudo apt install python3.12-venv`).
44
- Software version 1.32.9 uses CLI contract **61** and storage layout **5**.
44
+ Software version 1.32.11 uses CLI contract **61** and storage layout **5**.
45
45
 
46
46
  ## Try it in a disposable repository
47
47
 
@@ -50,7 +50,7 @@ With the environment above active:
50
50
  ```bash
51
51
  git clone https://github.com/xuanheng-tech/worktree-controller.git wc
52
52
  cd wc
53
- git checkout v1.32.9
53
+ git checkout v1.32.11
54
54
  python examples/quickstart.py --workspace "$HOME/wc-first-run"
55
55
  ```
56
56
 
@@ -6,7 +6,7 @@ It checks repository policy before allocating a worktree, grants writing authori
6
6
  process, and records handoff, integration, recovery and release evidence. Git remains the source
7
7
  of truth for files, branches, commits and registered worktrees.
8
8
 
9
- **Current release: 1.32.9 · Linux · Python 3.12 · Apache-2.0**
9
+ **Current release: 1.32.11 · Linux · Python 3.12 · Apache-2.0**
10
10
 
11
11
  ## Install
12
12
 
@@ -15,7 +15,7 @@ Use a virtual environment in a new directory:
15
15
  ```bash
16
16
  python3.12 -m venv .venv
17
17
  . .venv/bin/activate
18
- python -m pip install worktree-controller==1.32.9
18
+ python -m pip install worktree-controller==1.32.11
19
19
  worktree-controller --version
20
20
  worktree-controller capabilities --json
21
21
  ```
@@ -24,7 +24,7 @@ WC requires Git and readable Linux `/proc`. Other operating systems and Python v
24
24
  supported by this release. Its one runtime dependency is `websockets>=15,<16`.
25
25
  On Ubuntu, if creating the environment reports that `ensurepip` is unavailable, install the
26
26
  distribution's `python3.12-venv` package first (for example, `sudo apt install python3.12-venv`).
27
- Software version 1.32.9 uses CLI contract **61** and storage layout **5**.
27
+ Software version 1.32.11 uses CLI contract **61** and storage layout **5**.
28
28
 
29
29
  ## Try it in a disposable repository
30
30
 
@@ -33,7 +33,7 @@ With the environment above active:
33
33
  ```bash
34
34
  git clone https://github.com/xuanheng-tech/worktree-controller.git wc
35
35
  cd wc
36
- git checkout v1.32.9
36
+ git checkout v1.32.11
37
37
  python examples/quickstart.py --workspace "$HOME/wc-first-run"
38
38
  ```
39
39
 
@@ -31,6 +31,17 @@ uses the public Snapshot Runner package. Context Loader and `tool-skill-sync` ar
31
31
 
32
32
  ## Concurrent diagnostic reads
33
33
 
34
+ From 1.32.10, `resource-clean --typed` holds the existing repository lock shared and an
35
+ exclusive lock on the existing transactions directory. Exact closed `lifecycle-history`
36
+ queries continue to validate all metadata and evidence while cleanup runs. Ordinary mutations
37
+ and a second cleanup wait; activation refuses the live cleanup even before its journal exists.
38
+ No lock is released during an action, and cleanup never changes allocation/publication metadata.
39
+ Doctor also takes the cleanup observation gate, so its filesystem and journal diagnostics wait
40
+ for a coherent boundary. A dry-run may observe changing ignored content and refuse; rerun it
41
+ after cleanup. Registered-venv cleanup, checkout release and publication retain their exclusive
42
+ repository lock. This patch improves read availability; it does not promise a faster cleanup or
43
+ bound unrelated publication, release, storage or operating-system waits.
44
+
34
45
  `doctor` refreshes Git inventory after acquiring the repository's shared lock and retains that
35
46
  lock through metadata, semantic, transaction and retirement diagnostics. Normal Controller
36
47
  mutations wait until those reads finish, so a guarded release cannot remove an inspected checkout
@@ -42,6 +53,15 @@ original exit code and request, and compare the exact repository and checkout us
42
53
  Git command before concluding that an object was lost. Repeating a diagnostic does not recover a
43
54
  lifecycle, replace frozen source evidence or settle another owner's outstanding authorization.
44
55
 
56
+ If history returns `HISTORY_EVIDENCE_INCOMPLETE` because a release receipt's original plan is
57
+ missing, keep the citation unverified. `reconcile receipts` acknowledges existing publication
58
+ evidence; it does not reconstruct release plans. `release-recovery-inspect` requires both the
59
+ original pending journal and its plan and refuses an already completed receipt. First locate
60
+ trusted original plan bytes and prove their exact identity against the receipt. Existing task,
61
+ branch, ancestry, teardown evidence or a newly generated plan cannot replace that original.
62
+ No original evidence means there is no supported recovery to execute; preserve the receipt and
63
+ report the gap rather than copying metadata by hand or manufacturing completion.
64
+
45
65
  ## Handoff and integrate
46
66
 
47
67
  Publish the source branch, hand off its exact commit and scope, then enqueue one integration intent.
@@ -270,6 +290,24 @@ belongs to the delegated reconciler. Dirty or active work stays with its owner;
270
290
  and immutable receipts are not disposable checkout payloads. For an interrupted release, use
271
291
  `release-recovery-inspect` and replay its exact published recovery arguments.
272
292
 
293
+ From 1.32.11, an already removed feature/audit checkout at `RELEASED_RECORDED` may finish
294
+ its original receipt with its own retained `METADATA_WRITTEN` acquire journal present. The
295
+ original plan and both journal identities must agree with the acquired/released history,
296
+ exact +1 record CAS, retained HEAD and absent checkout, binding and writer lease. Other
297
+ transactions, changed requests and earlier incomplete phases remain blocked. The acquire
298
+ journal is preserved and stays nonterminal until the immutable release receipt is complete.
299
+ This recovery completes evidence only; it does not grant owner authority or business acceptance.
300
+
301
+ If that exact pending release blocks a normal runtime rollout, first deliver and verify the
302
+ repair through source review, tests and normal publication, then stage the exact published
303
+ release through `controller-activate stage`. Its versioned `bin/worktree-controller` is the
304
+ ordinary public CLI: an independently authorized operator may invoke only the original
305
+ `release-recovery-inspect` / returned `release` request with that pinned installed binary.
306
+ Check the public version, staged source manifest and published commit first. No candidate
307
+ activation, active-pin edit, journal edit or rollout exception is involved. Require complete
308
+ exact receipt history, then rerun normal activation with the full governed repository set.
309
+
310
+
273
311
  `reconcile release-plans` keeps plans referenced by durable release receipts. They remain part
274
312
  of closed lifecycle and branch-retirement evidence after the checkout is gone. It retires only
275
313
  unreferenced leftover plans for already released allocations with durable release evidence.
@@ -957,6 +957,26 @@ keeps resolving after the move.
957
957
 
958
958
  ## Unified release plan and disposable resources
959
959
 
960
+ From 1.32.11, removed-release replay also admits its exact retained acquire predecessor
961
+ only for a feature/audit `RELEASED_RECORDED` release. Original plan/journal identity, acquired
962
+ and released history, +1 record CAS, retained HEAD, absence of checkout/binding/writer lease,
963
+ and all existing request/resource recovery guards remain mandatory. No journal is classified
964
+ terminal or changed by that admission; complete immutable release evidence is still required.
965
+ Other transactions and unsupported partial phases remain refused. This changes no command,
966
+ option, capability, CLI contract or storage format.
967
+
968
+ From 1.32.10, typed cleanup serializes on the existing transactions-directory inode while
969
+ holding `repo.lock` shared. This excludes normal metadata writers and older exclusive cleanup
970
+ implementations for the entire operation, while closed history readers retain their existing
971
+ shared repository lock and full evidence checks. Only the existing atomic cleanup journal,
972
+ append-only action/completion evidence and exact authorized ignored resources may change.
973
+ Allocation, binding, release and publication metadata stay stable. Doctor additionally takes a
974
+ shared transactions-directory gate before its repository lock; activation probes the exclusive
975
+ cleanup gate. The directory is initialized under the normal exclusive repository lock; it adds
976
+ no pathname or storage format. Cleanup gates are process-owned file locks, released by the kernel
977
+ on exit; partial operations retain their original recovery evidence and never gain release authority.
978
+ Registered-venv cleanup and physical checkout release keep their exclusive repository locks.
979
+
960
980
  Clean `RETAINED` feature/audit checkouts can use `close-delivered` when their committed
961
981
  content is already published. First run `close-delivered --path PATH
962
982
  --expected-record-version N --owner-release OWNER --actor ACTOR --dry-run --json`.
@@ -12,7 +12,8 @@ hashes, file/ancestor checks, limits and refusal codes stay unchanged; mutation
12
12
  retain their original owners. Release acceptance covers the exact installed candidate, ordinary
13
13
  1.32.7 upgrades and historical 1.30.4 restoration. Publication and local activation remain
14
14
  separate verified steps. The 1.32.9 patch skips unrelated live Git inventory for closed lifecycle selectors while
15
- retaining full locked metadata and immutable evidence validation. Software version 1.32.9 retains
15
+ retaining full locked metadata and immutable evidence validation. The 1.32.10 patch keeps closed history readable during typed cleanup while preserving writer,
16
+ cleanup, diagnostic and activation serialization. Software version 1.32.11 retains
16
17
  CLI contract 61, the existing capability versions and storage layout 5, and serializes doctor
17
18
  snapshot reads with normal Controller mutations. Diagnostics refresh Git inventory after taking
18
19
  the shared repository lock, then retain it through semantic, transaction and retirement checks.
@@ -4,7 +4,7 @@ build-backend = "uv_build"
4
4
 
5
5
  [project]
6
6
  name = "worktree-controller"
7
- version = "1.32.9"
7
+ version = "1.32.11"
8
8
  description = "Govern Git worktree budgets, authority, ownership, and lifecycle"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.12,<3.13"
@@ -4,7 +4,7 @@ build-backend = "uv_build"
4
4
 
5
5
  [project]
6
6
  name = "worktree-controller"
7
- version = "1.32.9"
7
+ version = "1.32.11"
8
8
  description = "Govern Git worktree budgets, authority, ownership, and lifecycle"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.12,<3.13"
@@ -1,3 +1,3 @@
1
1
  """Worktree lifecycle controller."""
2
2
 
3
- __version__ = "1.32.9"
3
+ __version__ = "1.32.11"
@@ -1608,7 +1608,7 @@ def doctor(repository_path: Path, *, namespace_pid: int | None = None) -> dict[s
1608
1608
  try:
1609
1609
  # Release/refresh must not invalidate Git paths while the snapshot's
1610
1610
  # semantic and transaction evidence is still being read.
1611
- stack.enter_context(store.lock(exclusive=False))
1611
+ stack.enter_context(store.cleanup_observation_lock())
1612
1612
  repository = inventory(repository_path)
1613
1613
  snapshot = store.load()
1614
1614
  except ControllerError as exc:
@@ -5002,7 +5002,7 @@ def cleanup_typed_disposable(
5002
5002
 
5003
5003
  store = MetadataStore(inventory(repository_path).common_dir)
5004
5004
  receipt_id = None
5005
- with store.lock(exclusive=not dry_run):
5005
+ with (store.lock(exclusive=False) if dry_run else store.cleanup_lock()):
5006
5006
  repository = inventory(repository_path)
5007
5007
  snapshot = store._load_unlocked()
5008
5008
  item, record = _managed_record(repository, snapshot, target)
@@ -7820,6 +7820,7 @@ def _release_transaction(
7820
7820
  *,
7821
7821
  target_path: str,
7822
7822
  allocation_id: str | None = None,
7823
+ removed_release_recovery: bool = False,
7823
7824
  ) -> dict[str, Any] | None:
7824
7825
  if not store.transactions_dir.exists():
7825
7826
  return None
@@ -7836,6 +7837,14 @@ def _release_transaction(
7836
7837
  and transaction.get("target_path") == target_path
7837
7838
  and (allocation_id is None or transaction.get("allocation_id") == allocation_id)
7838
7839
  ]
7840
+ if removed_release_recovery and len(matches) == 1 and len(transactions) == 2:
7841
+ from .transaction_scope import acquire_precedes_removed_release
7842
+
7843
+ other, = (row for row in transactions if row is not matches[0])
7844
+ if other.get("command") == "acquire" and acquire_precedes_removed_release(
7845
+ store, other["transaction_id"], matches[0]
7846
+ ):
7847
+ transactions = matches
7839
7848
  if len(matches) > 1 or len(matches) != len(transactions):
7840
7849
  raise ControllerError(
7841
7850
  "INTERRUPTED_TRANSACTION", "another controller transaction requires recovery"
@@ -8561,7 +8570,9 @@ def _recover_or_replay_removed_release(
8561
8570
  raise ControllerError(
8562
8571
  "BLOCK_DRIFT", "release target remains registered but is unavailable"
8563
8572
  )
8564
- transaction = _release_transaction(store, target_path=target_path)
8573
+ transaction = _release_transaction(
8574
+ store, target_path=target_path, removed_release_recovery=not dry_run,
8575
+ )
8565
8576
  if transaction is None:
8566
8577
  matches = [
8567
8578
  receipt
@@ -349,6 +349,99 @@ class MetadataStore:
349
349
  finally:
350
350
  os.close(descriptor)
351
351
 
352
+ @contextmanager
353
+ def cleanup_observation_lock(self) -> Iterator[None]:
354
+ """Keep filesystem/journal diagnostics coherent with typed cleanup.
355
+
356
+ History needs only repo.lock; doctor also reads the mutable cleanup
357
+ journal and filesystem. Take the directory gate before repo.lock so a
358
+ waiting diagnostic never obstructs the cleanup it is waiting for.
359
+ """
360
+ with self.lock(exclusive=False):
361
+ if not self.transactions_dir.exists():
362
+ # Cleanup must first take repo.lock exclusively to create it.
363
+ yield
364
+ return
365
+ try:
366
+ descriptor = os.open(
367
+ self.transactions_dir,
368
+ os.O_RDONLY | os.O_DIRECTORY | os.O_NOFOLLOW | os.O_CLOEXEC,
369
+ )
370
+ except OSError as exc:
371
+ raise ControllerError(
372
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory cannot be observed"
373
+ ) from exc
374
+ try:
375
+ try:
376
+ fcntl.flock(descriptor, fcntl.LOCK_SH)
377
+ except OSError as exc:
378
+ raise ControllerError(
379
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup observation lock cannot be acquired"
380
+ ) from exc
381
+ with self.lock(exclusive=False):
382
+ try:
383
+ opened = os.fstat(descriptor)
384
+ named = os.stat(self.transactions_dir, follow_symlinks=False)
385
+ except OSError as exc:
386
+ raise ControllerError(
387
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory disappeared"
388
+ ) from exc
389
+ if (opened.st_dev, opened.st_ino) != (named.st_dev, named.st_ino):
390
+ raise ControllerError(
391
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory changed"
392
+ )
393
+ yield
394
+ finally:
395
+ os.close(descriptor)
396
+
397
+ @contextmanager
398
+ def cleanup_lock(self) -> Iterator[None]:
399
+ """Fence typed filesystem cleanup while keeping metadata readers available.
400
+
401
+ Cleanup changes only its atomic journal, append-only action/completion
402
+ evidence and the authorized ignored trees, never allocation metadata.
403
+ The existing transactions directory serializes these cleanup executions;
404
+ a shared repo.lock excludes every ordinary writer, including old runtimes.
405
+ Both locks stay held through the final scan or failure receipt. There is
406
+ no lock conversion or unlocked action boundary.
407
+ """
408
+ descriptor = None
409
+ try:
410
+ # Require the real mutation arbiter before initializing the existing
411
+ # journal directory. Never bootstrap a missing repository lock here.
412
+ try:
413
+ with self.lock(exclusive=True):
414
+ self.transactions_dir.mkdir(mode=0o700, exist_ok=True)
415
+ descriptor = os.open(
416
+ self.transactions_dir,
417
+ os.O_RDONLY | os.O_DIRECTORY | os.O_NOFOLLOW | os.O_CLOEXEC,
418
+ )
419
+ fcntl.flock(descriptor, fcntl.LOCK_EX)
420
+ except OSError as exc:
421
+ raise ControllerError(
422
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory cannot be locked"
423
+ ) from exc
424
+ with self.lock(exclusive=False):
425
+ if not self.flock_held:
426
+ raise ControllerError("MISSING_REPOSITORY_LOCK", "cleanup requires the repository lock")
427
+ try:
428
+ opened = os.fstat(descriptor)
429
+ named = os.stat(self.transactions_dir, follow_symlinks=False)
430
+ except OSError as exc:
431
+ raise ControllerError(
432
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory disappeared"
433
+ ) from exc
434
+ if (opened.st_dev, opened.st_ino, opened.st_mode) != (
435
+ named.st_dev, named.st_ino, named.st_mode
436
+ ):
437
+ raise ControllerError(
438
+ "RESOURCE_CLEANUP_LOCK_UNAVAILABLE", "cleanup journal directory changed"
439
+ )
440
+ yield
441
+ finally:
442
+ if descriptor is not None:
443
+ os.close(descriptor)
444
+
352
445
  def _decoded(
353
446
  self, path: Path | os.DirEntry[str], decode: Callable[[Mapping[str, Any]], _Decoded]
354
447
  ) -> _Decoded:
@@ -1071,7 +1071,7 @@
1071
1071
  "session_launcher_entrypoint": "worktree-session",
1072
1072
  "session_entrypoint": "worktree-session-end",
1073
1073
  "tool_name": "worktree-controller",
1074
- "tool_version": "1.32.9",
1074
+ "tool_version": "1.32.11",
1075
1075
  "delivered_closeout_version": 1,
1076
1076
  "retained_archive_version": 1,
1077
1077
  "retention_convergence_version": 2,
@@ -453,6 +453,64 @@ def _acquire_task_progress(store: MetadataStore, journal: dict, head: str) -> st
453
453
  return None
454
454
 
455
455
 
456
+ def acquire_precedes_removed_release(store: MetadataStore, transaction: str, release: dict) -> bool:
457
+ """Permit receipt recovery, never terminal classification, for this exact predecessor.
458
+
459
+ A retained acquire cannot become terminal until the release receipt exists. Only a
460
+ release already recorded at its exact +1 CAS may finish that receipt in its presence.
461
+ Both journals stay authoritative; ordinary mutations and rollout still see them pending.
462
+ """
463
+ _require_flock(store)
464
+ acquire = _journal_preconditions(
465
+ store, transaction, "acquire", frozenset({"METADATA_WRITTEN"})
466
+ )
467
+ if acquire is None or release.get("phase") != "RELEASED_RECORDED":
468
+ return False
469
+ identity = ("repository_id", "allocation_id", "target_path", "branch")
470
+ if any(acquire.get(key) != release.get(key) for key in identity):
471
+ return False
472
+ plan_id = release.get("release_plan_id")
473
+ if not isinstance(plan_id, str):
474
+ return False
475
+ snapshot = store._load_unlocked()
476
+ plan = snapshot.release_plans.get(plan_id)
477
+ record = snapshot.records.get(acquire["allocation_id"])
478
+ if plan is None or record is None or not record.history:
479
+ return False
480
+ if any(release.get(key) != getattr(plan, key) for key in (
481
+ *identity, "expected_head", "expected_record_version",
482
+ )):
483
+ return False
484
+ first, last = record.history[0], record.history[-1]
485
+ if (
486
+ record.role not in {"feature", "audit"}
487
+ or record.role != plan.role
488
+ or record.authority_key != plan.authority_key
489
+ or record.base_commit != acquire["expected_head"]
490
+ or record.task_commit != plan.expected_head
491
+ or record.lifecycle != "RELEASED"
492
+ or record.owner != "unassigned"
493
+ or record.record_version != plan.expected_record_version + 1
494
+ or first.get("event") != "ACQUIRED"
495
+ or first.get("from") is not None
496
+ or first.get("to") != "ACTIVE"
497
+ or first.get("at") != record.created_at
498
+ or last.get("event") not in {"RELEASED", "RELEASE_RECOVERED"}
499
+ or last.get("from") != plan.lifecycle
500
+ or last.get("to") != "RELEASED"
501
+ or _target_state(Path(plan.target_path)) != "absent"
502
+ or _worktree_registration(store.root.parents[1], Path(plan.target_path))[2] != "absent"
503
+ or _allocation_bound_anywhere(store, plan.allocation_id) != "unbound"
504
+ or (store.writer_leases_dir / f"{plan.allocation_id}.json").exists()
505
+ or _branch_ref_state(store.root.parents[1], f"refs/heads/{plan.branch}")
506
+ != (plan.expected_head, "resolved")
507
+ ):
508
+ return False
509
+ from .git_backend import is_ancestor
510
+
511
+ return is_ancestor(store.root.parents[1], acquire["expected_head"], plan.expected_head)
512
+
513
+
456
514
  def acquire_evidence_terminal(store: MetadataStore, transaction: str) -> str | None:
457
515
  """Close an interrupted acquire only on positive current-state proof.
458
516
 
@@ -1071,7 +1071,7 @@
1071
1071
  "session_launcher_entrypoint": "worktree-session",
1072
1072
  "session_entrypoint": "worktree-session-end",
1073
1073
  "tool_name": "worktree-controller",
1074
- "tool_version": "1.32.9",
1074
+ "tool_version": "1.32.11",
1075
1075
  "delivered_closeout_version": 1,
1076
1076
  "retained_archive_version": 1,
1077
1077
  "retention_convergence_version": 2,