worktree-controller 1.32.4__tar.gz → 1.32.6__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.
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/PKG-INFO +5 -5
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/README.md +4 -4
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/architecture.md +9 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/operations.md +15 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/publishing.md +13 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/roadmap.md +17 -7
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/pyproject.toml +1 -1
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/pyproject.toml.orig +1 -1
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/__init__.py +1 -1
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/integration_conflict.py +3 -3
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/integration_retry.py +5 -4
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/lifecycle.py +3 -32
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/publication_execution.py +3 -2
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/semantics.py +34 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6/src/worktree_controller}/tool_cli_contract.json +1 -1
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/writer_lease.py +3 -1
- {worktree_controller-1.32.4/src/worktree_controller → worktree_controller-1.32.6}/tool_cli_contract.json +1 -1
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/LICENSE +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/client-integration.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/daily-workflow.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/first-change.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/getting-started.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/integration-boundaries.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/reference.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/docs/scope.md +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/examples/change_task.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/examples/client_continuation.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/examples/quickstart.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/activation_layout.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/branch_retirement.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/canonical_refresh.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/canonical_transition.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/cleanup_attempts.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/cleanup_evidence.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/cleanup_recovery.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/cli.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/controller.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/convergence.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/delivered_closeout.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/disposable.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/environment.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/frozen_recovery.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/git_backend.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/governance.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/hardlinks.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/integration_cleanup.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/keyed_document_scope.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/lifecycle_history.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/lifecycle_observation.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/metadata_codec.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/metadata_relocation.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/models.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/mount_diagnostics.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/multiple_cleanup_recovery.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/namespace_migration.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/native_session_recovery.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/owner_actions.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/policy.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/preservation.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/preserved_cleanup.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/reconciler.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/record_updates.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/recovery_guidance.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/registration_backfill.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/registration_prune.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/release_intents.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/rendering.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/resource_admission.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/retirement_adapters.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/retirement_execution.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/session.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/session_admission.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/source_cleanup.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/source_preservation.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/source_recovery.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/store.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/task_workflow.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/transaction_scope.py +0 -0
- {worktree_controller-1.32.4 → worktree_controller-1.32.6}/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.
|
|
3
|
+
Version: 1.32.6
|
|
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.
|
|
26
|
+
**Current release: 1.32.6 · 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.
|
|
35
|
+
python -m pip install worktree-controller==1.32.6
|
|
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.
|
|
44
|
+
Software version 1.32.6 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.
|
|
53
|
+
git checkout v1.32.6
|
|
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
|
+
**Current release: 1.32.6 · 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.
|
|
18
|
+
python -m pip install worktree-controller==1.32.6
|
|
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.
|
|
27
|
+
Software version 1.32.6 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.
|
|
36
|
+
git checkout v1.32.6
|
|
37
37
|
python examples/quickstart.py --workspace "$HOME/wc-first-run"
|
|
38
38
|
```
|
|
39
39
|
|
|
@@ -83,3 +83,12 @@ mutation helpers, clock, lock scope, cancellation and history append unchanged.
|
|
|
83
83
|
uses the same query directly; lifecycle retains its existing internal aliases. A changed HEAD
|
|
84
84
|
or record version still renews immediately, and repeated unchanged expiries retain the existing
|
|
85
85
|
one-day backoff cap. This extraction changes no CLI, capability or storage contract.
|
|
86
|
+
|
|
87
|
+
Scope digest and overlap queries live in `semantics` alongside scope normalization. Integration
|
|
88
|
+
retry calls these shared pure helpers directly; lifecycle retains compatibility aliases. Their
|
|
89
|
+
serialization, empty-scope interpretation and parent/child path rules remain unchanged.
|
|
90
|
+
|
|
91
|
+
Allocation-to-intent lookup also lives in `semantics`. It reads only the caller's snapshot,
|
|
92
|
+
returns the original unique intent or no match, and refuses multiple intents bound to one
|
|
93
|
+
allocation as `INVALID_METADATA`. Publication execution and conflict resolution use this shared
|
|
94
|
+
query directly; lifecycle keeps its existing alias, lock scope and transition guards.
|
|
@@ -83,6 +83,21 @@ original invocation and current observations; do not automatically apply the mai
|
|
|
83
83
|
to an unrelated identity change. An unchanged clean PREPARING candidate can be observed again with
|
|
84
84
|
its exact original claim without allocating another checkout.
|
|
85
85
|
|
|
86
|
+
## Finished commands and runtime reconciliation
|
|
87
|
+
|
|
88
|
+
A command exit releases its writer entitlement; runtime occupancy remains until ordinary
|
|
89
|
+
reconciliation proves it clear. `RUNTIME_OCCUPIED` means positive holder, group or path-use
|
|
90
|
+
evidence. `RUNTIME_SCAN_UNCERTAIN` means visibility or identity evidence is incomplete. Both
|
|
91
|
+
retain the binding and execution reservation; neither proves task completion or permits cleanup.
|
|
92
|
+
|
|
93
|
+
After resolving the reported uncertainty or waiting for the actual workload to finish, rerun
|
|
94
|
+
`admission-queue --repo <canonical-repo> --apply --json` with the original request intact.
|
|
95
|
+
Inspect its per-request outcomes: exit 0 reports a successful queue observation even when a row
|
|
96
|
+
still has a blocker. Direct `binding-remove` returns exit 2 on either refusal. Once clear,
|
|
97
|
+
ordinary reconciliation removes the binding and releases the execution budget; commits and local
|
|
98
|
+
files remain in their checkout. Do not remove bindings manually, loosen guards or treat a retry
|
|
99
|
+
count as proof that the runtime must already be clear.
|
|
100
|
+
|
|
86
101
|
## Recovery guidance and session closeout
|
|
87
102
|
|
|
88
103
|
When `capabilities --json` advertises `recovery_guidance_version` 1, inspect one checkout:
|
|
@@ -102,3 +102,16 @@ Receipts distinguish a read-only audit, `PUBLISHED_VERIFIED`, and `FRESH_INSTALL
|
|
|
102
102
|
Skipped tests remain skipped. Local installation or activation of a maintainer's WC runtime is a
|
|
103
103
|
separate operation; publishing a package does not update that runtime or authorize a production
|
|
104
104
|
release in any repository governed by WC.
|
|
105
|
+
|
|
106
|
+
## Publication visibility
|
|
107
|
+
|
|
108
|
+
Successful writes can precede their visibility through GitHub or PyPI queries. After a successful
|
|
109
|
+
create, upload or publish command, the publisher polls only the missing observation. All phases
|
|
110
|
+
share one five-minute monotonic deadline, including draft, asset, PyPI and public-release visibility.
|
|
111
|
+
Each network command retains its own timeout; an in-flight request can finish after that deadline.
|
|
112
|
+
Metadata requests ask caches to revalidate. This does not guarantee immediate upstream visibility.
|
|
113
|
+
|
|
114
|
+
Every poll rechecks the immutable tag and main containment; normal inventory and byte/hash checks
|
|
115
|
+
remain active. Command errors, unknown assets, yanked files and identity/checksum drift stop
|
|
116
|
+
immediately. Polls never repeat writes. If visibility still times out, the job fails and keeps the
|
|
117
|
+
original bundle and current release. Audit destinations and rerun failed jobs in the same run as above.
|
|
@@ -5,12 +5,15 @@ direction. Each stage needs its own tested deliverable; later ideas are not curr
|
|
|
5
5
|
|
|
6
6
|
## Current baseline
|
|
7
7
|
|
|
8
|
-
WC 1.32.
|
|
9
|
-
are already on main.
|
|
10
|
-
82
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
WC 1.32.5 retains CLI contract 61 and storage layout 5. The scope and architecture documents
|
|
9
|
+
are already on main. Previous extractions reduced private cross-module imports from 93 to
|
|
10
|
+
82 and then 80; pure scope hashing/overlap queries lowered it to 78. This maintenance batch
|
|
11
|
+
moves allocation-to-intent lookup into `semantics`, reducing the baseline to 76 while retaining
|
|
12
|
+
its duplicate-identity refusal and lifecycle alias. Mutation helpers, clocks and lock scope stay
|
|
13
|
+
with their existing owner. Batch this source maintenance into the next planned release; it does
|
|
14
|
+
not declare a new package release or change the installed 1.32.5 runtime.
|
|
15
|
+
|
|
16
|
+
GF 1.9.8 already consumes SR's public read API and WC's versioned publication/retirement
|
|
14
17
|
protocols. CL 1.3.10 and SR 2.5.12 already use main on both hosting platforms. These completed
|
|
15
18
|
items are not prerequisites still waiting to happen.
|
|
16
19
|
|
|
@@ -24,7 +27,7 @@ acceptance gates, and historical temporary-file impact. No historical evidence i
|
|
|
24
27
|
| --- | --- | --- | --- |
|
|
25
28
|
| Now: boundaries | Current protocol and consumer inventory, including legacy adapters | Named owner per interface, source references, explicit unknowns; no changes to supported commands | Conflicting evidence keeps the interface supported |
|
|
26
29
|
| Now: WC structure | One cohesive pure release-intent query extraction | Full integration gate; existing renewal/cancellation/recovery behavior; CLI 61/storage 5 unchanged | Revert the isolated extraction if behavior differs |
|
|
27
|
-
|
|
|
30
|
+
| Shared quality checks: delivered | CL/SR adopt release-tools with a reviewed full commit pin | Both hosted parallel pilots and final three-version checks passed; SR retains its package check | Restore the pinned original consumer workflow; PyPI/Gitea flows remain owned by consumers |
|
|
28
31
|
| Next 2–6 weeks | Further WC extraction only where a shared responsibility is clear; measure maintenance burden and failures | One behavior-preserving batch at a time, consumer gates, shrinking private-import baseline | Keep injected clocks, transaction and crash hooks with their owner until an explicit migration is tested |
|
|
29
32
|
| Following 6–12 weeks | Evaluate moving manifests, compatibility catalog and shared Skills from GF to a dedicated toolchain owner | Full ownership inventory, staged installer/migration, exactly one active writer, historical pin and rollback tests | No second simultaneous Skill authority; no ownership switch on file-copy evidence |
|
|
30
33
|
| Following 3–6 months | Evaluate a staged GF Python core migration | Characterization of exit/status/ref effects, isolated old/new comparisons, interruption recovery and real consumer gates | No dual production writes; preserve scanner refusals and existing installation until replacement passes |
|
|
@@ -44,3 +47,10 @@ Do not introduce a shared runtime Python dependency into CL/SR, merge the tools,
|
|
|
44
47
|
Python floor, move host-specific defaults without migration, or replace existing WC/GF protocols.
|
|
45
48
|
GitHub-first release consolidation and a future toolchain repository remain design decisions,
|
|
46
49
|
not permission to disable existing Gitea delivery or platform controls.
|
|
50
|
+
|
|
51
|
+
The current maintenance task moves allocation-to-intent lookup to `semantics`, lowering the
|
|
52
|
+
private-import baseline from 78 to 76. Use its real task to observe checkpoint pause, fresh-executor
|
|
53
|
+
resume, Finalizer handoff, integration and release; preserve pending results instead of interpreting
|
|
54
|
+
an advisory success as completion. The released publication visibility window keeps exact bytes,
|
|
55
|
+
identities, failed-command outcomes and same-bundle recovery mandatory. CL/SR shared quality checks
|
|
56
|
+
have passed their hosted parallel and final matrices.
|
|
@@ -9,7 +9,7 @@ from typing import Any
|
|
|
9
9
|
from .git_backend import commits_with_parents, inventory
|
|
10
10
|
from .integration_retry import _sources
|
|
11
11
|
from .models import ControllerError
|
|
12
|
-
from .semantics import integration_candidate_issues
|
|
12
|
+
from .semantics import integration_candidate_issues, intent_for_allocation
|
|
13
13
|
from .store import MetadataStore
|
|
14
14
|
|
|
15
15
|
|
|
@@ -23,7 +23,7 @@ def resolve_integration(
|
|
|
23
23
|
finalizer_record_id: str,
|
|
24
24
|
) -> dict[str, Any]:
|
|
25
25
|
from .controller import status
|
|
26
|
-
from .lifecycle import
|
|
26
|
+
from .lifecycle import _intent_payload
|
|
27
27
|
from .record_updates import updated_intent, updated_record
|
|
28
28
|
from .semantics import assert_record_version as _cas
|
|
29
29
|
from .semantics import managed_record as _managed_record
|
|
@@ -40,7 +40,7 @@ def resolve_integration(
|
|
|
40
40
|
snapshot = store._load_unlocked()
|
|
41
41
|
item, record = _managed_record(repository, snapshot, target)
|
|
42
42
|
_cas(record, expected_record_version)
|
|
43
|
-
intent =
|
|
43
|
+
intent = intent_for_allocation(snapshot, record.allocation_id)
|
|
44
44
|
if record.owner != owner:
|
|
45
45
|
raise ControllerError("OWNER_MISMATCH", "resolution owner does not match")
|
|
46
46
|
if (
|
|
@@ -17,6 +17,8 @@ from .semantics import (
|
|
|
17
17
|
integration_intent_abandoned,
|
|
18
18
|
integration_prerequisite,
|
|
19
19
|
integration_queue_order,
|
|
20
|
+
scope_digest,
|
|
21
|
+
scopes_overlap,
|
|
20
22
|
unallocated_integration_conflict,
|
|
21
23
|
)
|
|
22
24
|
from .store import MetadataStore
|
|
@@ -57,7 +59,7 @@ def _sources(
|
|
|
57
59
|
*,
|
|
58
60
|
require_idle: bool = True,
|
|
59
61
|
) -> dict[str, Any]:
|
|
60
|
-
from .lifecycle import _resolve_integration_sources
|
|
62
|
+
from .lifecycle import _resolve_integration_sources
|
|
61
63
|
|
|
62
64
|
observed = _resolve_integration_sources(
|
|
63
65
|
repository,
|
|
@@ -74,7 +76,7 @@ def _sources(
|
|
|
74
76
|
intent.source_finalizer_record_ids,
|
|
75
77
|
intent.source_snapshot_ids,
|
|
76
78
|
)
|
|
77
|
-
if observed != expected or
|
|
79
|
+
if observed != expected or scope_digest(intent.scope_paths) != intent.scope_digest:
|
|
78
80
|
raise ControllerError("SOURCE_EVIDENCE_MISMATCH", "retry cannot replace source or scope")
|
|
79
81
|
evidence = {}
|
|
80
82
|
for allocation, branch, head in zip(
|
|
@@ -227,7 +229,6 @@ def _prerequisite(
|
|
|
227
229
|
parent: IntegrationIntent,
|
|
228
230
|
child: IntegrationIntent,
|
|
229
231
|
) -> dict[str, Any]:
|
|
230
|
-
from .lifecycle import _scopes_overlap
|
|
231
232
|
from .semantics import effective_intent_state
|
|
232
233
|
|
|
233
234
|
if (
|
|
@@ -258,7 +259,7 @@ def _prerequisite(
|
|
|
258
259
|
and other.allocation_id is not None
|
|
259
260
|
and effective_intent_state(snapshot, other) not in {"RELEASED", "ABANDONED"}
|
|
260
261
|
and other.queue_sequence > parent.queue_sequence
|
|
261
|
-
and
|
|
262
|
+
and scopes_overlap(other.scope_paths, child.scope_paths)
|
|
262
263
|
for other in snapshot.integration_intents.values()
|
|
263
264
|
):
|
|
264
265
|
raise ControllerError(
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/lifecycle.py
RENAMED
|
@@ -97,9 +97,12 @@ from .semantics import (
|
|
|
97
97
|
)
|
|
98
98
|
from .semantics import effective_intent_state as _effective_intent_state
|
|
99
99
|
from .semantics import integration_reconciliation as _integration_reconciliation
|
|
100
|
+
from .semantics import intent_for_allocation as _intent_for_allocation
|
|
100
101
|
from .semantics import managed_record as _managed_record
|
|
101
102
|
from .semantics import publication_receipt_lease_released as _publication_receipt_lease_released
|
|
102
103
|
from .semantics import record_for as _record_for
|
|
104
|
+
from .semantics import scope_digest as _scope_digest
|
|
105
|
+
from .semantics import scopes_overlap as _scopes_overlap
|
|
103
106
|
from .store import (
|
|
104
107
|
INTEGRATION_INTENT_CONTRACT_VERSION,
|
|
105
108
|
INTEGRATION_INTENT_SCHEMA_VERSION,
|
|
@@ -152,31 +155,12 @@ def _crash_point(name: str) -> None:
|
|
|
152
155
|
os._exit(97)
|
|
153
156
|
|
|
154
157
|
|
|
155
|
-
def _scope_digest(scope_paths: tuple[str, ...]) -> str:
|
|
156
|
-
encoded = json.dumps(list(scope_paths), ensure_ascii=True, separators=(",", ":"))
|
|
157
|
-
return hashlib.sha256(encoded.encode("utf-8")).hexdigest()
|
|
158
|
-
|
|
159
|
-
|
|
160
158
|
def _intent_order(intent: IntegrationIntent) -> tuple[int, int | str, str]:
|
|
161
159
|
if intent.queue_sequence > 0:
|
|
162
160
|
return (1, intent.queue_sequence, intent.intent_id)
|
|
163
161
|
return (0, intent.enqueued_at, intent.intent_id)
|
|
164
162
|
|
|
165
163
|
|
|
166
|
-
def _scopes_overlap(left: tuple[str, ...], right: tuple[str, ...]) -> bool:
|
|
167
|
-
if not left or not right:
|
|
168
|
-
return True
|
|
169
|
-
for left_path in left:
|
|
170
|
-
for right_path in right:
|
|
171
|
-
if (
|
|
172
|
-
left_path == right_path
|
|
173
|
-
or left_path.startswith(f"{right_path}/")
|
|
174
|
-
or right_path.startswith(f"{left_path}/")
|
|
175
|
-
):
|
|
176
|
-
return True
|
|
177
|
-
return False
|
|
178
|
-
|
|
179
|
-
|
|
180
164
|
def _released_intent_evidence(
|
|
181
165
|
snapshot: MetadataSnapshot,
|
|
182
166
|
intent: IntegrationIntent,
|
|
@@ -372,19 +356,6 @@ def _cancel_release_intents(
|
|
|
372
356
|
)
|
|
373
357
|
|
|
374
358
|
|
|
375
|
-
def _intent_for_allocation(
|
|
376
|
-
snapshot: MetadataSnapshot, allocation_id: str
|
|
377
|
-
) -> IntegrationIntent | None:
|
|
378
|
-
matches = [
|
|
379
|
-
intent
|
|
380
|
-
for intent in snapshot.integration_intents.values()
|
|
381
|
-
if intent.allocation_id == allocation_id
|
|
382
|
-
]
|
|
383
|
-
if len(matches) > 1:
|
|
384
|
-
raise ControllerError("INVALID_METADATA", "multiple intents bind one allocation")
|
|
385
|
-
return matches[0] if matches else None
|
|
386
|
-
|
|
387
|
-
|
|
388
359
|
def _duration_ms(start: str, end: str) -> int:
|
|
389
360
|
return max(
|
|
390
361
|
0,
|
|
@@ -21,9 +21,10 @@ from pathlib import Path
|
|
|
21
21
|
from typing import Any, TextIO
|
|
22
22
|
|
|
23
23
|
from .git_backend import _git, inventory, is_ancestor, validate_branch_name
|
|
24
|
-
from .lifecycle import
|
|
24
|
+
from .lifecycle import _validate_prepared_publication_receipt
|
|
25
25
|
from .models import ControllerError
|
|
26
26
|
from .policy import load_policy
|
|
27
|
+
from .semantics import intent_for_allocation
|
|
27
28
|
from .semantics import managed_record as _managed_record
|
|
28
29
|
from .store import MetadataStore, now_iso
|
|
29
30
|
|
|
@@ -163,7 +164,7 @@ class PublicationSession:
|
|
|
163
164
|
raise ControllerError(
|
|
164
165
|
"PUBLICATION_EVIDENCE_MISMATCH", "leased candidate evidence differs"
|
|
165
166
|
)
|
|
166
|
-
intent =
|
|
167
|
+
intent = intent_for_allocation(snapshot, record.allocation_id)
|
|
167
168
|
if intent is None or (
|
|
168
169
|
intent.state != "PUBLISHING"
|
|
169
170
|
or intent.publication_identity != lease.lease_id
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/semantics.py
RENAMED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
+
import hashlib
|
|
6
|
+
import json
|
|
5
7
|
from dataclasses import replace
|
|
6
8
|
from pathlib import Path, PurePosixPath
|
|
7
9
|
from typing import Any
|
|
@@ -97,6 +99,19 @@ def assert_record_version(
|
|
|
97
99
|
)
|
|
98
100
|
|
|
99
101
|
|
|
102
|
+
def intent_for_allocation(
|
|
103
|
+
snapshot: MetadataSnapshot, allocation_id: str
|
|
104
|
+
) -> IntegrationIntent | None:
|
|
105
|
+
matches = [
|
|
106
|
+
intent
|
|
107
|
+
for intent in snapshot.integration_intents.values()
|
|
108
|
+
if intent.allocation_id == allocation_id
|
|
109
|
+
]
|
|
110
|
+
if len(matches) > 1:
|
|
111
|
+
raise ControllerError("INVALID_METADATA", "multiple intents bind one allocation")
|
|
112
|
+
return matches[0] if matches else None
|
|
113
|
+
|
|
114
|
+
|
|
100
115
|
def integration_intent_abandoned(intent: IntegrationIntent) -> bool:
|
|
101
116
|
"""Recognize the explicit terminal event without forgiving unexplained drift."""
|
|
102
117
|
return (
|
|
@@ -204,6 +219,25 @@ def integration_queue_order(
|
|
|
204
219
|
return (0, anchor.enqueued_at, phase, intent.intent_id)
|
|
205
220
|
|
|
206
221
|
|
|
222
|
+
def scope_digest(scope_paths: tuple[str, ...]) -> str:
|
|
223
|
+
encoded = json.dumps(list(scope_paths), ensure_ascii=True, separators=(",", ":"))
|
|
224
|
+
return hashlib.sha256(encoded.encode("utf-8")).hexdigest()
|
|
225
|
+
|
|
226
|
+
|
|
227
|
+
def scopes_overlap(left: tuple[str, ...], right: tuple[str, ...]) -> bool:
|
|
228
|
+
if not left or not right:
|
|
229
|
+
return True
|
|
230
|
+
for left_path in left:
|
|
231
|
+
for right_path in right:
|
|
232
|
+
if (
|
|
233
|
+
left_path == right_path
|
|
234
|
+
or left_path.startswith(f"{right_path}/")
|
|
235
|
+
or right_path.startswith(f"{left_path}/")
|
|
236
|
+
):
|
|
237
|
+
return True
|
|
238
|
+
return False
|
|
239
|
+
|
|
240
|
+
|
|
207
241
|
def normalize_scope_paths(values: tuple[str, ...]) -> tuple[str, ...]:
|
|
208
242
|
normalized: set[str] = set()
|
|
209
243
|
for raw in values:
|
|
@@ -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.
|
|
1074
|
+
"tool_version": "1.32.6",
|
|
1075
1075
|
"delivered_closeout_version": 1,
|
|
1076
1076
|
"retained_archive_version": 1,
|
|
1077
1077
|
"retention_convergence_version": 2,
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/writer_lease.py
RENAMED
|
@@ -92,8 +92,10 @@ def assert_runtime_clear(target: Path, holders: tuple[WriterHolder, ...]) -> Non
|
|
|
92
92
|
if (not holders or process is None or any(holder.boot_id != boot_id()
|
|
93
93
|
or process.start_ticks >= holder.start_ticks for holder in holders)):
|
|
94
94
|
observed.append(reference)
|
|
95
|
-
if observed or
|
|
95
|
+
if observed or evidence["managed_references"]:
|
|
96
96
|
raise ControllerError("RUNTIME_OCCUPIED", "runtime remains until managed and observed use is clear")
|
|
97
|
+
if evidence["managed_visibility_uncertainties"] or evidence["scan_uncertainties"]:
|
|
98
|
+
raise ControllerError("RUNTIME_SCAN_UNCERTAIN", "runtime visibility remains uncertain")
|
|
97
99
|
|
|
98
100
|
|
|
99
101
|
def foreign_runtime_bindings(record: MetadataRecord, holder: WriterHolder, lease_id: str | None) -> tuple[str, ...]:
|
|
@@ -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.
|
|
1074
|
+
"tool_version": "1.32.6",
|
|
1075
1075
|
"delivered_closeout_version": 1,
|
|
1076
1076
|
"retained_archive_version": 1,
|
|
1077
1077
|
"retention_convergence_version": 2,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/controller.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/convergence.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/disposable.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/environment.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/frozen_recovery.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/git_backend.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/governance.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/hardlinks.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/metadata_codec.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/owner_actions.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/preservation.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/reconciler.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/record_updates.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/release_intents.py
RENAMED
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/rendering.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/session.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/source_cleanup.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/source_recovery.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/task_workflow.py
RENAMED
|
File without changes
|
|
File without changes
|
{worktree_controller-1.32.4 → worktree_controller-1.32.6}/src/worktree_controller/writer_session.py
RENAMED
|
File without changes
|