merge: resolve conflicts with origin/master (tasks + skills commands)

Author: factorydroid

Cargo.lock

@@ -66,6 +66,7 @@ members = [
     "cortex-migrations",
     "cortex-experimental",
     "cortex-commands",
+    "cortex-skills",
 
     # CLI - Features (Phase 3 - Codex-inspired)
     "cortex-collab",
@@ -218,6 +219,7 @@ 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" }

Cargo.toml

@@ -168,8 +168,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