cluxion-agentplugin-preprocessing 0.3.3__tar.gz → 0.3.4__tar.gz

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cluxion-agentplugin-preprocessing
-Version: 0.3.3
+Version: 0.3.4
 Summary: Universal agent plugin for Cluxion preprocessing, honesty contracts, clarification, Rust work queue, and resource-aware harness handoff.
 Project-URL: Homepage, https://github.com/cluxion/cluxion-Agentplugin-preprocessing
 Project-URL: Repository, https://github.com/cluxion/cluxion-Agentplugin-preprocessing

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cluxion-agentplugin-preprocessing"
-version = "0.3.3"
+version = "0.3.4"
 description = "Universal agent plugin for Cluxion preprocessing, honesty contracts, clarification, Rust work queue, and resource-aware harness handoff."
 readme = "README.md"
 requires-python = ">=3.11"

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/src/cluxion_agentplugin_preprocessing/__init__.py

@@ -2,6 +2,6 @@
 
 from __future__ import annotations
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 __all__ = ["__version__"]

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/src/cluxion_runtime/core/dispatch_store.py

@@ -146,15 +146,19 @@ def build_briefing_payload(work_id: str, *, dispatch_dir: Path | None = None) ->
     """Bundle all segment results into a final synthesis prompt."""
     bundle = load_dispatch_bundle(work_id, dispatch_dir=dispatch_dir)
     steps = _steps(bundle)
-    missing = [str(step.get("step_id", "")) for step in steps if step.get("status") != "succeeded"]
+    missing: list[str] = []
+    briefing_blocks: list[str] = []
+    for step in steps:
+        if step.get("status") != "succeeded":
+            missing.append(str(step.get("step_id", "")))
+        briefing_blocks.append(_briefing_step_block(step))
     if missing:
         return {"work_id": work_id, "ready": False, "missing_steps": missing, "briefing_prompt": ""}
-    prompt = _briefing_prompt(bundle, steps)
     return {
         "work_id": work_id,
         "ready": True,
         "missing_steps": [],
-        "briefing_prompt": prompt,
+        "briefing_prompt": _briefing_prompt(bundle, briefing_blocks),
         "result_count": len(steps),
     }
 
@@ -204,7 +208,7 @@ def _public_step(step: dict[str, object]) -> dict[str, object]:
     }
 
 
-def _briefing_prompt(bundle: dict[str, object], steps: list[dict[str, object]]) -> str:
+def _briefing_prompt(bundle: dict[str, object], briefing_blocks: list[str]) -> str:
     lines = [
         "[cluxion_final_briefing]",
         f"work_id={bundle.get('work_id', '')}",
@@ -212,20 +216,21 @@ def _briefing_prompt(bundle: dict[str, object], steps: list[dict[str, object]])
         "Separate verified facts, tool results, inferences, missing checks, and remaining risks.",
         "[segment_results]",
     ]
-    for step in steps:
-        lines.append(
-            "\n".join(
-                [
-                    f"step_id={step.get('step_id', '')}",
-                    f"segment_id={step.get('segment_id', '')}",
-                    f"checksum={step.get('checksum', '')}",
-                    str(step.get("result", "")),
-                ]
-            )
-        )
+    lines.extend(briefing_blocks)
     return "\n\n".join(lines)
 
 
+def _briefing_step_block(step: dict[str, object]) -> str:
+    return "\n".join(
+        [
+            f"step_id={step.get('step_id', '')}",
+            f"segment_id={step.get('segment_id', '')}",
+            f"checksum={step.get('checksum', '')}",
+            str(step.get("result", "")),
+        ]
+    )
+
+
 def _steps(bundle: dict[str, object]) -> list[dict[str, object]]:
     steps = bundle.get("steps")
     if not isinstance(steps, list):
@@ -269,7 +274,7 @@ def _exclusive_bundle_lock(path: Path) -> Iterator[None]:
         # Non-POSIX platforms keep atomic rename but skip advisory locking.
         yield
         return
-    lock_path = path.with_name(f"{path.name}.lock")
+    lock_path = path.parent / ".dispatch.lock"
     with lock_path.open("a+b") as lock_file:
         _fcntl.flock(lock_file.fileno(), _fcntl.LOCK_EX)
         try:

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/src/cluxion_runtime/resources/py_queue.py

@@ -290,7 +290,7 @@ def _exclusive_bundle_lock(path: Path) -> Iterator[None]:
         # Non-POSIX platforms keep atomic rename but skip advisory locking.
         yield
         return
-    lock_path = path.with_name(f"{path.name}.lock")
+    lock_path = path.parent / ".dispatch.lock"
     with lock_path.open("a+b") as lock_file:
         _fcntl.flock(lock_file.fileno(), _fcntl.LOCK_EX)
         try:

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/tests/runtime/test_dispatch_store.py

@@ -108,6 +108,16 @@ def test_next_marks_step_running_on_disk(tmp_path: Path, queued_plan: HarnessPla
     assert statuses.count("running") == 1
 
 
+def test_dispatch_store_uses_shared_lock_instead_of_per_bundle_locks(tmp_path: Path, queued_plan: HarnessPlan) -> None:
+    persist_dispatch_bundle(queued_plan, dispatch_dir=tmp_path)
+    payload = next_dispatch_step("w-queued", dispatch_dir=tmp_path)
+    record_dispatch_result("w-queued", str(payload["step"]["step_id"]), result="done", dispatch_dir=tmp_path)
+
+    assert not (tmp_path / "w-queued.json.lock").exists()
+    if dispatch_store._fcntl is not None:
+        assert (tmp_path / ".dispatch.lock").exists()
+
+
 def test_concurrent_next_dispatch_steps_do_not_claim_same_step(
     tmp_path: Path, queued_plan: HarnessPlan, monkeypatch: pytest.MonkeyPatch
 ) -> None:

{cluxion_agentplugin_preprocessing-0.3.3 → cluxion_agentplugin_preprocessing-0.3.4}/tests/runtime/test_py_queue_concurrency.py

@@ -117,6 +117,18 @@ def test_python_queue_concurrent_record_steps_preserve_both_updates(
     assert steps[step_ids[1]]["result"] == "done:1"
 
 
+def test_python_queue_uses_shared_lock_instead_of_per_bundle_locks(tmp_path: Path) -> None:
+    store_dir = tmp_path / "queue"
+    py_queue.run("persist", _store_payload(store_dir, work_id="py-race", bundle=_bundle(1)))
+    payload = py_queue.run("next", _store_payload(store_dir, work_id="py-race"))
+    py_queue.run("record", _store_payload(store_dir, work_id="py-race", step_id=payload["step"]["step_id"]))
+
+    dispatch_dir = store_dir / "dispatch"
+    assert not (dispatch_dir / "py-race.json.lock").exists()
+    if py_queue._fcntl is not None:
+        assert (dispatch_dir / ".dispatch.lock").exists()
+
+
 def test_python_queue_concurrent_dequeue_serializes_select_update(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None: