feat(ci): promote prune-hook reconciliation [claude] to lifecycle_smoke

Adds pytest.mark.lifecycle_smoke to only the `claude` parametrization
of test_prune_removes_merged_hook_entries_and_sidecar (deliberately
excluding the `cursor` sibling), now that #2249's prune-hook fix has
merged. The existing marker-driven `-m lifecycle_smoke tests/integration`
command in ci.yml auto-picks up the newly-marked test with zero workflow
edit -- confirmed via `git diff` showing no change to the lifecycle-smoke
job section.

Family grows from 12 to 13 tests, all passing (13 passed, ~16.5-17.9s
local across 3 repeated runs -- comparable to the prior 12-test baseline
of ~17.7-18.4s). Failure-injection re-proof: reverting #2249's production
fix (prune.py, hook_integrator.py, uninstall/engine.py, apm_package.py)
to pre-fix content causes exactly `[claude]` to fail under `-m
lifecycle_smoke` selection (12 passed, 1 failed), confirming the gate is
load-bearing for this regression; restored cleanly afterward (working
tree verified clean pre/post).

Also merges origin/main (additive merge commit, no rebase/force-push)
to bring in #2249 plus intervening #2237 (Windows CI fix) and #2246
(lockfile-property tests). Resolved one real conflict in
merge-gate.yml's EXPECTED_CHECKS where main's #2237 follow-on
independently added a new required "Windows Compatibility Gate" check
to the same ternary our branch extended with "Lifecycle Smoke (Linux)"
-- both required-check names now coexist in both event branches.

Docs (integration-testing.md, CHANGELOG.md) updated to enumerate the
6th target and prune's Consume/Produce/Govern coverage. No change
needed to test_ci_topology.py's semantic assertions (count-agnostic
by design) or ci.yml (marker-driven auto-pickup, zero edit).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 75891045-fa50-40b7-9354-b4649195f724

Author: danielmeppiel

CHANGELOG.md

@@ -11,9 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Pull requests now run a ~65-70s hermetic `Lifecycle Smoke (Linux)` check,
   selected declaratively via a registered `lifecycle_smoke` pytest marker,
-  that validates core install, lock-convergence, and policy-enforcement
-  contracts at PR time instead of only in the merge queue -- no network,
-  credentials, or built binary required (#2247).
+  that validates core install, lock-convergence, policy-enforcement, and
+  prune-time hook-reconciliation contracts at PR time instead of only in
+  the merge queue -- no network, credentials, or built binary required
+  (#2247).
 - Object-form Git dependencies now reject unsupported keys instead of silently
   ignoring them; use `ref` rather than `version`, and omit inert `name` fields
   from `git: parent`. CI audit also rejects full-SHA pins whose

docs/src/content/docs/contributing/integration-testing.md

@@ -34,9 +34,9 @@ APM uses a tiered approach to integration testing:
 - **Trigger**: merge queue integration workflow, plus tag, schedule, and manual promotion runs
 
 ### 3. **Lifecycle Smoke** (PR-time required check)
-- **Location**: selected declaratively via the registered `lifecycle_smoke` pytest marker, applied to all of `tests/integration/test_install_content_hash_roundtrip.py`, `test_policy_pinned_constraint_e2e.py`, `test_virtual_claude_skill_lock_convergence.py`, `test_virtual_package_lifecycle_matrix.py` (module-level), and to only `test_architecture_authorities.py::test_ado_lock_coordinates_have_single_owner` (function-level -- the file's other tests are not part of this family)
-- **Purpose**: Promote the smallest stable, hermetic slice of the real Consume/Produce/Govern lifecycle contracts onto the PR-time critical path, so a regression in install/lock/audit convergence or ADO lock-coordinate handling fails the PR instead of only surfacing once a change reaches the merge queue
-- **Scope**: install content-hash roundtrip, policy pinned-constraint enforcement, virtual-skill lock convergence, the virtual/manifestless lifecycle matrix, and the ADO lock-coordinate ownership guard -- no built binary, no network, no credentials
+- **Location**: selected declaratively via the registered `lifecycle_smoke` pytest marker, applied to all of `tests/integration/test_install_content_hash_roundtrip.py`, `test_policy_pinned_constraint_e2e.py`, `test_virtual_claude_skill_lock_convergence.py`, `test_virtual_package_lifecycle_matrix.py` (module-level), to only `test_architecture_authorities.py::test_ado_lock_coordinates_have_single_owner` (function-level -- the file's other tests are not part of this family), and to only the `[claude]` parametrization of `test_prune_hook_reconciliation_e2e.py::test_prune_removes_merged_hook_entries_and_sidecar` (the sibling `[cursor]` parametrization is deliberately excluded)
+- **Purpose**: Promote the smallest stable, hermetic slice of the real Consume/Produce/Govern lifecycle contracts onto the PR-time critical path, so a regression in install/lock/audit convergence, ADO lock-coordinate handling, or prune-time hook reconciliation fails the PR instead of only surfacing once a change reaches the merge queue
+- **Scope**: install content-hash roundtrip, policy pinned-constraint enforcement, virtual-skill lock convergence, the virtual/manifestless lifecycle matrix, the ADO lock-coordinate ownership guard, and prune's merged-hook/sidecar reconciliation -- no built binary, no network, no credentials
 - **Duration**: ~65-70s job wall time (hard 3-minute timeout)
 - **Trigger**: every pull request and merge queue run (`ci.yml`'s `lifecycle-smoke` job, required via `merge-gate.yml`)
 - **Selection mechanism**: `pytest --strict-markers -m lifecycle_smoke tests/integration` -- declarative, not an explicit file/node-id list. If every `@pytest.mark.lifecycle_smoke` mark were ever removed, the marker family collects zero tests and pytest exits code 5 ("no tests collected"), failing the job loudly rather than silently shrinking. The marker is registered in `pyproject.toml`'s `[tool.pytest.ini_options]` markers list; `--strict-markers` rejects any typo'd or unregistered mark used as a decorator.
@@ -350,6 +350,7 @@ Promotion integration tests run on:
 - Policy pinned-constraint enforcement (Govern contract)
 - The virtual/manifestless lifecycle matrix: install, lock, frozen-install, update, and audit stay consistent (the direct #2240 regression)
 - The ADO lock-coordinate single-owner guard (the direct #2226 regression)
+- Prune's merged-hook and ownership-sidecar reconciliation for the `claude` target (the direct #2249 regression -- an orphaned package's merged hook entries and sidecar markers must be cleaned up, not left pointing at deleted scripts)
 - No network, no credentials, no built binary required for any of the above
 
 ## Benefits

tests/integration/test_prune_hook_reconciliation_e2e.py

@@ -220,7 +220,11 @@ def _pre_tool_use_commands(settings_path: Path) -> list[str]:
     return commands
 
 
-@pytest.mark.parametrize("target", ["claude", "cursor"], ids=["claude", "cursor"])
+@pytest.mark.parametrize(
+    "target",
+    [pytest.param("claude", marks=pytest.mark.lifecycle_smoke), "cursor"],
+    ids=["claude", "cursor"],
+)
 def test_prune_removes_merged_hook_entries_and_sidecar(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch, target: str
 ) -> None: