refactor: improve bpmn sidecar

Author: GTrunSec

.gitignore

@@ -1,3 +1,5 @@
+
+.reasonix
 node_modules
 .DS_Store
 *.pyc

Cargo.lock

@@ -180,11 +180,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1779427831,
-        "narHash": "sha256-n+TRxgTBGwOSqmPGhh9gqtFd9oIHadiQI7KUhpKLd04=",
+        "lastModified": 1779868340,
+        "narHash": "sha256-TK1oFHU2SPXuB1gUX3SnqNujViWiYIPYTuWxXy1wR6U=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "20e430bd6bc68a3e76f16a31a19504971b1832bd",
+        "rev": "93c592a1bf2bfcb7e72b9a5344611efcf72917db",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1779536132,
+        "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
         "type": "github"
       },
       "original": {

devenv.lock

@@ -47,7 +47,7 @@ let
 in
 {
   imports = [
-    nixosModules.claude
+    # nixosModules.claude
     nixosModules.flake-parts.omnibus
     nixosModules.files
     nixosModules.prek
@@ -144,6 +144,7 @@ in
 
   # https://devenv.sh/pre-commit-hooks/
   git-hooks.hooks = {
+    nixfmt.enable = true;
     ruff.enable = true;
     rustfmt.enable = true;
     clippy.enable = true;

devenv.nix

@@ -29,6 +29,18 @@ in
     #   #   sha256 = "sha256-ONSOVvDLfs8IDq4hI+XYAcMwjXSTBDIJlHB5Xwq107Q=";
     #   # };
     # })
+    (__inputs__.llm-agents.packages.${system}.reasonix.overrideAttrs rec {
+      # version = "0.53.0";
+      # src = pkgs.fetchFromGitHub {
+      #    owner = "esengine";
+      #    repo = "DeepSeek-Reasonix";
+      #   rev = "984e830df42ad065774df2c2a0ce06deb09dfa78";
+      #   sha256 = "sha256-DzTb9V8z9R+NTjvhuLq19jWZCHEYkhyQRH8DoQOBgLo=";
+      #   };
+      #  npmDeps = pkgs.importNpmLock {
+      #    npmRoot = src;
+      #  };
+      })        
     __inputs__.llm-agents.packages.${system}.gemini-cli
     __inputs__.llm-agents.packages.${system}.rtk
   ];

nix/modules/llm.nix

@@ -1,10 +1,14 @@
+use super::data::data_artifact_issue;
 use crate::bpmn_parse_api::BpmnSourceFile;
 use crate::lint_api::LintIssue;
 
 pub(super) fn issue_for_tag(
-    _source: &BpmnSourceFile,
-    _tag: &str,
+    source: &BpmnSourceFile,
+    tag: &str,
     _parent: Option<&str>,
 ) -> Option<LintIssue> {
-    None
+    match tag {
+        "dataStore" | "dataStoreReference" => Some(data_artifact_issue(source, tag)),
+        _ => None,
+    }
 }

packages/rust/crates/xiuxian-qianji-bpmn-engine/src/lint/bpmn/document_surface/issue/dispatch.rs

@@ -17,7 +17,6 @@ thiserror = { workspace = true }
 toml = { workspace = true }
 orgize = { workspace = true }
 xiuxian-qianji-bpmn-engine = { path = "../xiuxian-qianji-bpmn-engine" }
-xiuxian-wendao-parsers = { path = "../xiuxian-wendao-parsers" }
 
 [dev-dependencies]
 tempfile = { workspace = true }

packages/rust/crates/xiuxian-qianji-client/Cargo.toml

@@ -6,8 +6,8 @@ use std::path::{Path, PathBuf};
 use orgize::{Org, ast::OrgElementSelector};
 use serde::Deserialize;
 use xiuxian_qianji_bpmn_engine::{BpmnSourceFile, lint_bpmn_source};
-use xiuxian_wendao_parsers::{OrgizeLintOutputFormat, OrgizeLintRequest, lint_org_files};
 
+use super::org_lint::validate_org_syntax;
 use crate::QianjiClientError;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -248,26 +248,14 @@ fn validate_required_org_surface(
     surface_path: &Path,
     diagnostics: &mut Vec<String>,
 ) -> Result<bool, QianjiClientError> {
-    let request = OrgizeLintRequest {
-        paths: vec![surface_path.to_path_buf()],
-        output_format: OrgizeLintOutputFormat::Compact,
-        priority_highest: None,
-        priority_lowest: None,
-        priority_default: None,
-        fix: false,
-    };
-    let report = lint_org_files(&request).map_err(|error| {
+    let source = read_to_string(surface_path, "required Flowhub Org surface").map_err(|error| {
         QianjiClientError::message(format!(
-            "Failed to lint required Flowhub Org surface `{}` from manifest `{}`: {error}",
+            "Failed to read required Flowhub Org surface `{}` from manifest `{}`: {error}",
             required_surface,
             manifest_path.display()
         ))
     })?;
-    if report.is_clean() {
-        return Ok(true);
-    }
-    diagnostics.push(report.render(OrgizeLintOutputFormat::Compact));
-    Ok(false)
+    Ok(validate_org_syntax(surface_path, &source, diagnostics))
 }
 
 fn validate_required_bpmn_surface(
@@ -325,24 +313,7 @@ fn validate_policy_org_source(
     passed &=
         validate_policy_contract_graph_selector(policy_path, &source, &properties, diagnostics);
 
-    let request = OrgizeLintRequest {
-        paths: vec![policy_path.to_path_buf()],
-        output_format: OrgizeLintOutputFormat::Compact,
-        priority_highest: None,
-        priority_lowest: None,
-        priority_default: None,
-        fix: false,
-    };
-    let report = lint_org_files(&request).map_err(|error| {
-        QianjiClientError::message(format!(
-            "Failed to lint Flowhub policy entry `{}`: {error}",
-            policy_path.display()
-        ))
-    })?;
-    if !report.is_clean() {
-        diagnostics.push(report.render(OrgizeLintOutputFormat::Compact));
-        passed = false;
-    }
+    passed &= validate_org_syntax(policy_path, &source, diagnostics);
     Ok(passed)
 }
 
@@ -685,24 +656,7 @@ fn validate_org_source(
         passed = false;
     }
 
-    let request = OrgizeLintRequest {
-        paths: vec![source_pair.org_source.clone()],
-        output_format: OrgizeLintOutputFormat::Compact,
-        priority_highest: None,
-        priority_lowest: None,
-        priority_default: None,
-        fix: false,
-    };
-    let report = lint_org_files(&request).map_err(|error| {
-        QianjiClientError::message(format!(
-            "Failed to lint Flowhub Org source `{}`: {error}",
-            source_pair.org_source.display()
-        ))
-    })?;
-    if !report.is_clean() {
-        diagnostics.push(report.render(OrgizeLintOutputFormat::Compact));
-        passed = false;
-    }
+    passed &= validate_org_syntax(&source_pair.org_source, &source, diagnostics);
     Ok(passed)
 }
 

packages/rust/crates/xiuxian-qianji-client/src/flowhub/contract.rs

@@ -5,7 +5,6 @@ use std::fs;
 use std::path::{Path, PathBuf};
 
 use sha2::{Digest, Sha256};
-use xiuxian_wendao_parsers::{OrgizeLintOutputFormat, OrgizeLintRequest, lint_org_files};
 
 use crate::flowhub::contract::{
     FlowhubSourcePair, list_flowhub_source_pairs, parse_org_properties, property_value,
@@ -17,6 +16,7 @@ use crate::flowhub::model::{
     FlowhubScenarioRegistry, FlowhubScenarioRegistrySourcePair, FlowhubScenarioRegistryValidation,
     FlowhubSourcePairSummary, FlowhubValidation,
 };
+use crate::flowhub::org_lint::validate_org_syntax;
 use crate::flowhub::parse::{FlowhubAction, FlowhubCommand};
 use crate::flowhub::render::{RenderInput, render_output};
 
@@ -480,26 +480,17 @@ fn validate_generated_org_files(
     generated_files: &[FlowhubGeneratedFile],
     diagnostics: &mut Vec<String>,
 ) -> Result<bool, QianjiClientError> {
-    let paths = generated_files
-        .iter()
-        .map(|file| file.path.clone())
-        .collect::<Vec<_>>();
-    let request = OrgizeLintRequest {
-        paths,
-        output_format: OrgizeLintOutputFormat::Compact,
-        priority_highest: None,
-        priority_lowest: None,
-        priority_default: None,
-        fix: false,
-    };
-    let report = lint_org_files(&request).map_err(|error| {
-        QianjiClientError::message(format!("Failed to lint generated agent Org files: {error}"))
-    })?;
-    if report.is_clean() {
-        return Ok(true);
+    let mut passed = true;
+    for file in generated_files {
+        let source = fs::read_to_string(&file.path).map_err(|error| {
+            QianjiClientError::message(format!(
+                "Failed to read generated agent Org file `{}`: {error}",
+                file.path.display()
+            ))
+        })?;
+        passed &= validate_org_syntax(&file.path, &source, diagnostics);
     }
-    diagnostics.push(report.render(OrgizeLintOutputFormat::Compact));
-    Ok(false)
+    Ok(passed)
 }
 
 fn validate_generated_source_metadata(

packages/rust/crates/xiuxian-qianji-client/src/flowhub/materialize/runner.rs

@@ -4,6 +4,7 @@ mod contract;
 mod facade;
 mod materialize;
 mod model;
+mod org_lint;
 mod parse;
 mod render;