Merge origin/master into feature/background-agents-async-messaging - resolve conflicts

Author: factorydroid

Cargo.lock

@@ -66,12 +66,16 @@ members = [
     "cortex-migrations",
     "cortex-experimental",
     "cortex-commands",
+    "cortex-skills",
 
     # CLI - Features (Phase 3 - Codex-inspired)
     "cortex-collab",
     "cortex-network-proxy",
     "cortex-shell-snapshot",
 
+    # CLI - Integrations
+    "cortex-slack",
+    
     # CLI - LM Studio Integration
     "cortex-lmstudio",
 
@@ -218,12 +222,16 @@ cortex-linux-sandbox = { path = "cortex-linux-sandbox" }
 cortex-windows-sandbox = { path = "cortex-windows-sandbox" }
 cortex-lmstudio = { path = "cortex-lmstudio" }
 cortex-ollama = { path = "cortex-ollama" }
+cortex-skills = { path = "cortex-skills" }
 
 # Phase 3 - Codex-inspired crates
 cortex-collab = { path = "cortex-collab" }
 cortex-network-proxy = { path = "cortex-network-proxy" }
 cortex-shell-snapshot = { path = "cortex-shell-snapshot" }
 
+# Integrations
+cortex-slack = { path = "cortex-slack" }
+
 # OpenTUI crates
 opentui = { path = "opentui-rs" }
 opentui-core = { path = "opentui-rs/crates/opentui-core" }

Cargo.toml

@@ -197,8 +197,11 @@ pub use collab::{
 
 // Re-export task types
 pub use task::{
-    DagBuilder, DagError, DagHydrator, DagResult, DagStore, InMemoryDagStore, PersistenceError,
-    SerializedDag, Task, TaskDag, TaskId, TaskSpec, TaskStatus,
+    execute_dag, DagBuilder, DagError, DagHydrator, DagResult, DagStore, ExecutionProgress,
+    ExecutorConfig, ExecutorError, ExecutorResult, InMemoryDagStore, PersistenceError,
+    SerializedDag, SessionHydrationError, SessionHydrationResult, SessionHydrator,
+    SessionRestoreConfig, StaleTaskChecker, StaleTaskInfo, Task, TaskDag, TaskExecutionResult,
+    TaskExecutor, TaskId, TaskSpec, TaskStatus, TaskStore,
 };
 
 // Re-export routing types