cluxion-agentplugin-preprocessing 0.3.11__tar.gz → 0.3.12__tar.gz

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cluxion-agentplugin-preprocessing
-Version: 0.3.11
+Version: 0.3.12
 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.11 → cluxion_agentplugin_preprocessing-0.3.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cluxion-agentplugin-preprocessing"
-version = "0.3.11"
+version = "0.3.12"
 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.11 → cluxion_agentplugin_preprocessing-0.3.12}/rust/cluxion_queue/Cargo.lock

@@ -53,8 +53,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cluxion_queue"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
+ "fs2",
  "pyo3",
  "rusqlite",
  "serde",
@@ -148,6 +149,16 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/rust/cluxion_queue/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cluxion_queue"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "Durable work queue and dispatch store for Cluxion agent preprocessing"
 
@@ -20,6 +20,7 @@ rusqlite = { version = "0.32", features = ["bundled"] }
 sysinfo = "0.33"
 thiserror = "2"
 pyo3 = { version = "0.23", features = ["abi3-py311"], optional = true }
+fs2 = "0.4"
 
 [features]
 default = []

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/rust/cluxion_queue/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "cluxion-queue-native"
-version = "0.2.0"
+version = "0.2.1"
 description = "In-process Rust queue engine for cluxion-agentplugin-preprocessing"
 requires-python = ">=3.11"
 license = "Apache-2.0"

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/rust/cluxion_queue/src/dispatch.rs

@@ -1,6 +1,7 @@
-use std::fs;
+use std::fs::{self, OpenOptions};
 use std::path::{Path, PathBuf};
 
+use fs2::FileExt;
 use serde_json::{json, Value};
 
 use crate::types::{ok_payload, require_str, QueueError};
@@ -14,49 +15,55 @@ pub fn persist_bundle(store_dir: &Path, payload: &Value) -> Result<Value, QueueE
     let dispatch_dir = dispatch_dir(store_dir);
     fs::create_dir_all(&dispatch_dir)?;
     let path = bundle_path(&dispatch_dir, work_id)?;
-    write_atomic_json(&path, &bundle)?;
-    Ok(ok_payload(json!({
-        "stored": true,
-        "path": path.to_string_lossy(),
-    })))
+    with_dispatch_lock(&dispatch_dir, || {
+        write_atomic_json(&path, &bundle)?;
+        Ok(ok_payload(json!({
+            "stored": true,
+            "path": path.to_string_lossy(),
+        })))
+    })
 }
 
 pub fn next_step(store_dir: &Path, payload: &Value) -> Result<Value, QueueError> {
     let work_id = require_str(payload, "work_id")?;
-    let path = bundle_path(&dispatch_dir(store_dir), work_id)?;
-    let mut bundle = read_bundle(&path)?;
-    let mut selected: Option<Value> = None;
-    {
-        let steps = steps_mut(&mut bundle)?;
-        for step in steps.iter_mut() {
-            let status = step.get("status").and_then(Value::as_str).unwrap_or("");
-            if status == "queued" || status == "retry_wait" {
-                step["status"] = json!("running");
-                step["updated_at"] = json!(now_secs());
-                selected = Some(public_step(step));
-                break;
+    let dispatch_dir = dispatch_dir(store_dir);
+    fs::create_dir_all(&dispatch_dir)?;
+    let path = bundle_path(&dispatch_dir, work_id)?;
+    with_dispatch_lock(&dispatch_dir, || {
+        let mut bundle = read_bundle(&path)?;
+        let mut selected: Option<Value> = None;
+        {
+            let steps = steps_mut(&mut bundle)?;
+            for step in steps.iter_mut() {
+                let status = step.get("status").and_then(Value::as_str).unwrap_or("");
+                if status == "queued" || status == "retry_wait" {
+                    step["status"] = json!("running");
+                    step["updated_at"] = json!(now_secs());
+                    selected = Some(public_step(step));
+                    break;
+                }
             }
         }
-    }
-    if let Some(step) = selected {
-        write_atomic_json(&path, &bundle)?;
-        let remaining = remaining_count(steps_ref(&bundle)?);
-        return Ok(ok_payload(json!({
+        if let Some(step) = selected {
+            write_atomic_json(&path, &bundle)?;
+            let remaining = remaining_count(steps_ref(&bundle)?);
+            return Ok(ok_payload(json!({
+                "work_id": work_id,
+                "ready": true,
+                "step": step,
+                "remaining": remaining,
+                "synthesis_ready": false,
+            })));
+        }
+        let steps = steps_ref(&bundle)?;
+        Ok(ok_payload(json!({
             "work_id": work_id,
-            "ready": true,
-            "step": step,
-            "remaining": remaining,
-            "synthesis_ready": false,
-        })));
-    }
-    let steps = steps_ref(&bundle)?;
-    Ok(ok_payload(json!({
-        "work_id": work_id,
-        "ready": false,
-        "step": json!({}),
-        "remaining": remaining_count(steps),
-        "synthesis_ready": steps.iter().all(|step| step.get("status") == Some(&json!("succeeded"))),
-    })))
+            "ready": false,
+            "step": json!({}),
+            "remaining": remaining_count(steps),
+            "synthesis_ready": steps.iter().all(|step| step.get("status") == Some(&json!("succeeded"))),
+        })))
+    })
 }
 
 pub fn record_step(store_dir: &Path, payload: &Value) -> Result<Value, QueueError> {
@@ -68,37 +75,41 @@ pub fn record_step(store_dir: &Path, payload: &Value) -> Result<Value, QueueErro
         .get("failed")
         .and_then(Value::as_bool)
         .unwrap_or(false);
-    let path = bundle_path(&dispatch_dir(store_dir), work_id)?;
-    let mut bundle = read_bundle(&path)?;
-    let mut recorded_status = None;
-    {
-        let steps = steps_mut(&mut bundle)?;
-        for step in steps.iter_mut() {
-            if step.get("step_id") == Some(&json!(step_id)) {
-                step["status"] = json!(if failed { "failed" } else { "succeeded" });
-                step["result"] = json!(result);
-                step["error"] = json!(error);
-                step["updated_at"] = json!(now_secs());
-                recorded_status = step.get("status").cloned();
-                break;
+    let dispatch_dir = dispatch_dir(store_dir);
+    fs::create_dir_all(&dispatch_dir)?;
+    let path = bundle_path(&dispatch_dir, work_id)?;
+    with_dispatch_lock(&dispatch_dir, || {
+        let mut bundle = read_bundle(&path)?;
+        let mut recorded_status = None;
+        {
+            let steps = steps_mut(&mut bundle)?;
+            for step in steps.iter_mut() {
+                if step.get("step_id") == Some(&json!(step_id)) {
+                    step["status"] = json!(if failed { "failed" } else { "succeeded" });
+                    step["result"] = json!(result);
+                    step["error"] = json!(error);
+                    step["updated_at"] = json!(now_secs());
+                    recorded_status = step.get("status").cloned();
+                    break;
+                }
             }
         }
-    }
-    if let Some(status) = recorded_status {
-        write_atomic_json(&path, &bundle)?;
-        let steps = steps_ref(&bundle)?;
-        return Ok(ok_payload(json!({
-            "work_id": work_id,
-            "step_id": step_id,
-            "recorded": true,
-            "status": status,
-            "remaining": remaining_count(steps),
-            "synthesis_ready": steps.iter().all(|item| item.get("status") == Some(&json!("succeeded"))),
-        })));
-    }
-    Err(QueueError::Store(format!(
-        "dispatch step not found: {work_id}/{step_id}"
-    )))
+        if let Some(status) = recorded_status {
+            write_atomic_json(&path, &bundle)?;
+            let steps = steps_ref(&bundle)?;
+            return Ok(ok_payload(json!({
+                "work_id": work_id,
+                "step_id": step_id,
+                "recorded": true,
+                "status": status,
+                "remaining": remaining_count(steps),
+                "synthesis_ready": steps.iter().all(|item| item.get("status") == Some(&json!("succeeded"))),
+            })));
+        }
+        Err(QueueError::Store(format!(
+            "dispatch step not found: {work_id}/{step_id}"
+        )))
+    })
 }
 
 pub fn build_brief(store_dir: &Path, payload: &Value) -> Result<Value, QueueError> {
@@ -133,6 +144,22 @@ pub fn build_brief(store_dir: &Path, payload: &Value) -> Result<Value, QueueErro
     })))
 }
 
+fn with_dispatch_lock<T>(
+    dispatch_dir: &Path,
+    f: impl FnOnce() -> Result<T, QueueError>,
+) -> Result<T, QueueError> {
+    let lock_path = dispatch_dir.join(".dispatch.lock");
+    let lockfile = OpenOptions::new()
+        .read(true)
+        .write(true)
+        .create(true)
+        .open(&lock_path)?;
+    lockfile.lock_exclusive()?;
+    let result = f();
+    let _ = lockfile.unlock();
+    result
+}
+
 fn dispatch_dir(store_dir: &Path) -> PathBuf {
     store_dir.join("dispatch")
 }

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/rust/cluxion_queue/src/queue.rs

@@ -95,6 +95,8 @@ pub fn enqueue(store_dir: &Path, payload: &Value) -> Result<Value, QueueError> {
 pub fn dequeue(store_dir: &Path, _payload: &Value) -> Result<Value, QueueError> {
     let now = now_secs();
     with_db(store_dir, |conn| {
+        // Use BEGIN IMMEDIATE for atomic SELECT-then-UPDATE claim
+        conn.execute_batch("BEGIN IMMEDIATE;")?;
         let row = conn.query_row(
             "SELECT work_id, prompt, surface, priority, metadata_json
          FROM work_queue
@@ -118,6 +120,7 @@ pub fn dequeue(store_dir: &Path, _payload: &Value) -> Result<Value, QueueError>
                     "UPDATE work_queue SET status='running', updated_at=?2 WHERE work_id=?1",
                     params![work_id, now],
                 )?;
+                conn.execute_batch("COMMIT;")?;
                 Ok(ok_payload(json!({
                     "ready": true,
                     "item": {
@@ -129,11 +132,17 @@ pub fn dequeue(store_dir: &Path, _payload: &Value) -> Result<Value, QueueError>
                     }
                 })))
             }
-            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(ok_payload(json!({
-                "ready": false,
-                "item": Value::Null,
-            }))),
-            Err(err) => Err(QueueError::Sqlite(err)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                conn.execute_batch("COMMIT;")?;
+                Ok(ok_payload(json!({
+                    "ready": false,
+                    "item": Value::Null,
+                })))
+            }
+            Err(err) => {
+                let _ = conn.execute_batch("ROLLBACK;");
+                Err(QueueError::Sqlite(err))
+            }
         }
     })
 }

{cluxion_agentplugin_preprocessing-0.3.11 → cluxion_agentplugin_preprocessing-0.3.12}/src/cluxion_agentplugin_preprocessing/__init__.py

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