Skip to content

Commit e9632b0

Browse files
committed
Merge origin/master into feature/slack-integration
2 parents 848cf06 + 7fc3905 commit e9632b0

37 files changed

Lines changed: 9050 additions & 53 deletions

Cargo.lock

Lines changed: 12 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ members = [
6666
"cortex-migrations",
6767
"cortex-experimental",
6868
"cortex-commands",
69+
"cortex-skills",
6970

7071
# CLI - Features (Phase 3 - Codex-inspired)
7172
"cortex-collab",
@@ -221,6 +222,7 @@ cortex-linux-sandbox = { path = "cortex-linux-sandbox" }
221222
cortex-windows-sandbox = { path = "cortex-windows-sandbox" }
222223
cortex-lmstudio = { path = "cortex-lmstudio" }
223224
cortex-ollama = { path = "cortex-ollama" }
225+
cortex-skills = { path = "cortex-skills" }
224226

225227
# Phase 3 - Codex-inspired crates
226228
cortex-collab = { path = "cortex-collab" }

cortex-agents/src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@ pub use collab::{
167167

168168
// Re-export task types
169169
pub use task::{
170-
DagBuilder, DagError, DagHydrator, DagResult, DagStore, InMemoryDagStore, PersistenceError,
171-
SerializedDag, Task, TaskDag, TaskId, TaskSpec, TaskStatus,
170+
execute_dag, DagBuilder, DagError, DagHydrator, DagResult, DagStore, ExecutionProgress,
171+
ExecutorConfig, ExecutorError, ExecutorResult, InMemoryDagStore, PersistenceError,
172+
SerializedDag, SessionHydrationError, SessionHydrationResult, SessionHydrator,
173+
SessionRestoreConfig, StaleTaskChecker, StaleTaskInfo, Task, TaskDag, TaskExecutionResult,
174+
TaskExecutor, TaskId, TaskSpec, TaskStatus, TaskStore,
172175
};
173176

174177
// Re-export routing types

0 commit comments

Comments
 (0)