Merge pull request #247 from terraphim/resolve-pr216-conflicts

Resolve pr216 conflicts

Author: AlexMikhalev

.clippy.toml

@@ -5,8 +5,6 @@ allow-mixed-uninlined-format-args = true
 allow-unwrap-in-tests = true
 allow-expect-in-tests = true
 allow-dbg-in-tests = true
-too-many-arguments-threshold = 12
-type-complexity-threshold = 250
 cognitive-complexity-threshold = 30
 # Reduce false positives and focus on important issues
 disallowed-names = []
@@ -16,4 +14,4 @@ max-trait-bounds = 3
 max-fn-params-bools = 3
 enum-variant-name-threshold = 50
 # Allow certain patterns for faster development
-single-char-binding-names-threshold = 4
+single-char-binding-names-threshold = 4

.github/workflows/publish-tauri.yml

@@ -54,13 +54,12 @@ jobs:
         working-directory: ${{env.working-directory}}
         run: |
           # Inject secrets into Tauri configuration
-          op inject -i src-tauri/tauri.conf.json.template -o src-tauri/tauri.conf.json
+          op inject --force -i src-tauri/tauri.conf.json.template -o src-tauri/tauri.conf.json
           chmod 600 src-tauri/tauri.conf.json
 
           # Create environment file for signing
           cat > .env.ci << 'EOF'
-          TAURI_PRIVATE_KEY="op://Terraphim-Deployment/Tauri Update Signing/TAURI_PRIVATE_KEY"
-          TAURI_KEY_PASSWORD="op://Terraphim-Deployment/Tauri Update Signing/TAURI_KEY_PASSWORD"
+          TAURI_PRIVATE_KEY="op://TerraphimPlatform/tauri.update.signing/TAURI_PRIVATE_KEY"
           EOF
 
           # Build with injected signing keys

Cargo.toml

@@ -21,3 +21,6 @@ async-trait = "0.1"
 thiserror = "1.0"
 anyhow = "1.0"
 log = "0.4"
+
+[patch.crates-io]
+genai = { git = "https://github.com/terraphim/rust-genai.git", branch = "main" }

crates/terraphim_agent_evolution/src/workflows/parallelization.rs

@@ -688,7 +688,8 @@ impl WorkflowPattern for Parallelization {
 
         // Parallel execution reduces total time but adds overhead
         let estimated_tasks: usize = if input.prompt.len() > 2000 { 4 } else { 3 };
-        let batches = estimated_tasks.div_ceil(self.parallel_config.max_parallel_tasks);
+        let batches = (estimated_tasks + self.parallel_config.max_parallel_tasks - 1)
+            / self.parallel_config.max_parallel_tasks;
 
         base_time_per_task * batches as u32 + Duration::from_secs(10)
         // aggregation overhead

crates/terraphim_agent_registry/benches/registry_benchmarks.rs

@@ -24,8 +24,8 @@ log = { workspace = true }
 # Direct HTTP client approach (like Goose) for LLM communication
 reqwest = { version = "0.12", features = ["json", "stream"] }
 
-# Multi-provider generative AI client (using stable version due to let_chains issue in git version)
-genai = "0.3.5"
+# Multi-provider generative AI client (using terraphim fork with OpenRouter support)
+genai = { git = "https://github.com/terraphim/rust-genai.git", branch = "main" }
 
 # Additional dependencies
 ahash = { version = "0.8.8", features = ["serde"] }

crates/terraphim_multi_agent/Cargo.toml

@@ -1,9 +1,9 @@
-use criterion::{BenchmarkId, Criterion, black_box, criterion_group, criterion_main};
+use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use std::sync::Arc;
 use tokio::runtime::Runtime;
 
 use terraphim_multi_agent::{
-    AgentRegistry, CommandInput, CommandType, test_utils::create_test_agent_simple,
+    test_utils::create_test_agent_simple, AgentRegistry, CommandInput, CommandType,
 };
 
 /// Benchmark agent creation time

crates/terraphim_multi_agent/benches/agent_operations.rs

@@ -30,14 +30,12 @@ fn create_atomic_server_agent_role() -> Role {
         llm_chat_system_prompt: None,
         llm_chat_model: None,
         llm_context_window: Some(16000),
-        haystacks: vec![
-            Haystack::new(
-                "http://localhost:9883".to_string(), // Atomic server URL
-                ServiceType::Atomic,
-                true, // read-only
-            )
-            .with_atomic_secret(Some("your-base64-secret-here".to_string())),
-        ],
+        haystacks: vec![Haystack::new(
+            "http://localhost:9883".to_string(), // Atomic server URL
+            ServiceType::Atomic,
+            true, // read-only
+        )
+        .with_atomic_secret(Some("your-base64-secret-here".to_string()))],
         extra: {
             let mut extra = AHashMap::new();
             // Multi-agent specific configuration

crates/terraphim_multi_agent/examples/enhanced_atomic_server_example.rs

@@ -9,7 +9,7 @@
 use std::sync::Arc;
 use terraphim_config::Role;
 use terraphim_multi_agent::{
-    CommandInput, CommandType, MultiAgentResult, TerraphimAgent, test_utils::create_test_role,
+    test_utils::create_test_role, CommandInput, CommandType, MultiAgentResult, TerraphimAgent,
 };
 use terraphim_persistence::DeviceStorage;
 

crates/terraphim_multi_agent/examples/knowledge_graph_integration.rs

@@ -10,8 +10,8 @@ use ahash::AHashMap;
 use std::sync::Arc;
 use terraphim_config::Role;
 use terraphim_multi_agent::{
-    AgentRegistry, CommandInput, CommandType, MultiAgentResult, TerraphimAgent,
-    test_utils::create_test_role,
+    test_utils::create_test_role, AgentRegistry, CommandInput, CommandType, MultiAgentResult,
+    TerraphimAgent,
 };
 use terraphim_persistence::DeviceStorage;
 use terraphim_types::RelevanceFunction;