fix: resolve test failures from stale RUNNING dispatch recovery implementation

- Extract find_locked_dispatch helper to fleet/_reset.py domain layer to
  satisfy REQ-CNST-008 (no comprehensions in tool handlers)
- Hoist CampaignStateMutator import to module level to satisfy
  IL-3 cross-layer import hoisting and cross-package submodule rules
- Fix test_reset_dispatch_running_dead_process_succeeds to mock
  resolve_stale_running returning False (dead) and assert success
- Fix test_reset_dispatch_running_alive_process_still_blocked to mock
  resolve_stale_running returning True (alive) and assert block
- Update _LEGACY_JSON_WRITES line numbers for tools_kitchen.py shifts
- Bump tools_kitchen.py line limit exemption to 1290 for reaper call

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Trecek

src/autoskillit/fleet/__init__.py

@@ -24,6 +24,7 @@
 from ._reset import (
     ResetReport,
     find_dispatch_in_campaigns,
+    find_locked_dispatch,
     format_resettable_statuses,
     reset_dispatch_artifacts,
     resolve_worktrees_dir,
@@ -181,6 +182,7 @@
     "ResetReport",
     "compute_reset_labels",
     "find_dispatch_in_campaigns",
+    "find_locked_dispatch",
     "format_resettable_statuses",
     "reset_dispatch_artifacts",
     "resolve_worktrees_dir",

src/autoskillit/fleet/_reset.py

@@ -35,6 +35,7 @@
 __all__ = [
     "ResetReport",
     "find_dispatch_in_campaigns",
+    "find_locked_dispatch",
     "compute_reset_labels",
     "format_resettable_statuses",
     "reset_dispatch_artifacts",
@@ -80,6 +81,16 @@ def find_dispatch_in_campaigns(
     return None
 
 
+def find_locked_dispatch(dispatch_id: str, mutator: CampaignStateMutator) -> DispatchRecord | None:
+    """Locate a dispatch inside a locked mutator's state by dispatch_id or name."""
+    if mutator.state is None:
+        return None
+    for d in mutator.state.dispatches:
+        if (d.dispatch_id and d.dispatch_id == dispatch_id) or d.name == dispatch_id:
+            return d
+    return None
+
+
 def compute_reset_labels(target_state: IssueLabelState) -> tuple[list[str], list[str]]:
     label_def = LABEL_LIFECYCLE_REGISTRY[target_state]
     remove = sorted(s.value for s in label_def.removes_on_entry | {IssueLabelState.IN_PROGRESS})

src/autoskillit/server/tools/tools_fleet_reset.py

@@ -13,12 +13,14 @@
 from autoskillit.core import FleetErrorCode, IssueLabelState, fleet_error, get_logger
 from autoskillit.fleet import (
     _RESETTABLE_STATUSES,
+    CampaignStateMutator,
     DispatchStatus,
     ResetReport,
     cleanup_orphaned_labels,
     compute_reset_labels,
     discover_campaign_state_files,
     find_dispatch_in_campaigns,
+    find_locked_dispatch,
     format_resettable_statuses,
     reset_dispatch_artifacts,
     resolve_stale_running,
@@ -124,23 +126,8 @@ async def reset_dispatch(
         dispatch, state_path = result
 
         if dispatch.status == DispatchStatus.RUNNING:
-            from autoskillit.fleet.state import CampaignStateMutator  # circular-break
-
             with CampaignStateMutator(state_path) as m:
-                if m.state is None:
-                    return fleet_error(
-                        FleetErrorCode.FLEET_RESET_NOT_FOUND,
-                        f"No dispatch found matching {dispatch_id!r} in any campaign state file.",
-                    )
-                locked_dispatch = next(
-                    (
-                        d
-                        for d in m.state.dispatches
-                        if (d.dispatch_id and d.dispatch_id == dispatch_id)
-                        or d.name == dispatch_id
-                    ),
-                    None,
-                )
+                locked_dispatch = find_locked_dispatch(dispatch_id, m)
                 if locked_dispatch is None:
                     return fleet_error(
                         FleetErrorCode.FLEET_RESET_NOT_FOUND,

tests/arch/test_subpackage_isolation.py

@@ -967,7 +967,7 @@ def test_data_directories_are_not_python_packages() -> None:
         "co-located with the execution engine that calls them",
     ),
     "tools_kitchen.py": (
-        1280,
+        1290,
         "REQ-CNST-010-E7: kitchen tool handlers — open_kitchen and lock_ingredients require "
         "inline validation helpers (_check_override_keys, _build_ingredient_key_suggestions) "
         "for ingredient key validation; splitting would cross import-layer boundaries; "
@@ -980,7 +980,9 @@ def test_data_directories_are_not_python_packages() -> None:
         "_dispatch_infeasible_response helper for DOA pipeline refusal"
         "; capability admission control dispatch_feasible gating on deferred-recall and "
         "get_recipe paths (+22 net lines)"
-        "; supports_quota_check bool at call sites replaces resolve_provider (+3 net lines)",
+        "; supports_quota_check bool at call sites replaces resolve_provider (+3 net lines)"
+        "; reap_stale_dispatches_async call in _open_kitchen_handler for interactive session "
+        "dispatch recovery (+8 net lines)",
     ),
     "tools_execution.py": (
         1200,

tests/infra/test_schema_version_convention.py

@@ -119,11 +119,11 @@ def _is_yaml_dump(node: ast.expr) -> bool:
     # _lifespan.py — hooks.json self-heal on startup drift (co-owned with Claude plugin system)
     ("src/autoskillit/server/_lifespan.py", 90),
     # tools_kitchen.py — hook config, quota guard, git_ops_policy, ingredient locks overlay
-    ("src/autoskillit/server/tools/tools_kitchen.py", 200),
-    ("src/autoskillit/server/tools/tools_kitchen.py", 219),
-    ("src/autoskillit/server/tools/tools_kitchen.py", 253),
-    ("src/autoskillit/server/tools/tools_kitchen.py", 998),
-    ("src/autoskillit/server/tools/tools_kitchen.py", 1058),
+    ("src/autoskillit/server/tools/tools_kitchen.py", 204),
+    ("src/autoskillit/server/tools/tools_kitchen.py", 223),
+    ("src/autoskillit/server/tools/tools_kitchen.py", 257),
+    ("src/autoskillit/server/tools/tools_kitchen.py", 1013),
+    ("src/autoskillit/server/tools/tools_kitchen.py", 1073),
     # tools_pipeline_tracker.py — tracker_data dict
     ("src/autoskillit/server/tools/tools_pipeline_tracker.py", 166),
     # tools_status.py — mcp_data dict

tests/server/test_tools_fleet_reset.py

@@ -266,18 +266,20 @@ async def test_reset_dispatch_running_dead_process_succeeds(
         tool_ctx = build_ctx_open()
         _setup_tool(tool_ctx, monkeypatch, state_path)
 
-        from autoskillit.fleet import resolve_stale_running
+        def _mock_resolve_dead(d, _m, **_kw):
+            d.status = DispatchStatus.INTERRUPTED
+            return False
 
         monkeypatch.setattr(
             "autoskillit.server.tools.tools_fleet_reset.resolve_stale_running",
-            resolve_stale_running,
+            _mock_resolve_dead,
         )
 
         from autoskillit.server.tools.tools_fleet_reset import reset_dispatch
 
         raw = await reset_dispatch(dispatch_id="d-abc123")
         result = json.loads(raw)
-        assert result["error"] != "fleet_reset_still_running"
+        assert result["success"] is True
 
     @pytest.mark.anyio
     async def test_reset_dispatch_running_alive_process_still_blocked(
@@ -288,21 +290,11 @@ async def test_reset_dispatch_running_alive_process_still_blocked(
         tool_ctx = build_ctx_open()
         _setup_tool(tool_ctx, monkeypatch, state_path)
 
-        from autoskillit.fleet import resolve_stale_running
-
         monkeypatch.setattr(
             "autoskillit.server.tools.tools_fleet_reset.resolve_stale_running",
-            resolve_stale_running,
+            lambda _d, _m, **_kw: True,
         )
 
-        state_path_raw = state_path.read_text()
-        import json as _json
-
-        raw_obj = _json.loads(state_path_raw)
-        raw_obj["dispatches"][0]["dispatched_pid"] = 999999999
-        raw_obj["dispatches"][0]["dispatched_boot_id"] = "nonexistent-boot-id"
-        state_path.write_text(_json.dumps(raw_obj))
-
         from autoskillit.server.tools.tools_fleet_reset import reset_dispatch
 
         raw = await reset_dispatch(dispatch_id="d-abc123")