merge: v0.5.3 CORE-FOLD — orchestrator-providers + orchestrator-store into orchestrator-core

- crates/orchestrator-providers/ → crates/orchestrator-core/src/subject_adapter/ (4 files, ~2006 LOC)
- crates/orchestrator-store/ → crates/orchestrator-core/src/store/ (1 file, 180 LOC)
- 2 callers updated for providers (orchestrator-core itself + animus-runtime-shared)
- 2 callers updated for store (same)
- tempfile dep promoted from dev-only to prod in orchestrator-core (the store helpers use it in prod paths)

Workspace: 15 → 13 crates. Pure mechanical moves, no semantic change.

Note: subject_adapter::TaskServiceApi and services::TaskServiceApi now coexist in orchestrator-core (same for PlanningServiceApi). Disambiguation via 'as Provider...' aliases preserved; future cleanup could unify the names.

Branch: worktree-agent-a7dec38ca30288157 (commit 9ecedd5).

Author: Shooksie

AGENTS.md

@@ -41,14 +41,12 @@ crates/
 ├── animus-plugin-runtime/       # Runtime helpers for plugin implementations
 ├── orchestrator-cli/            # Main `animus` binary
 ├── orchestrator-config/         # Workflow, pack, and template config loading
-├── orchestrator-core/           # Domain services, bootstrap, state mutation APIs
+├── orchestrator-core/           # Domain services, subject_adapter, store, bootstrap, state mutation APIs
 ├── orchestrator-daemon-runtime/ # Daemon queue and scheduling runtime
 ├── orchestrator-logging/        # Shared tracing and log file utilities
 ├── orchestrator-notifications/  # Notification/runtime integration support
 ├── orchestrator-plugin-host/    # Plugin discovery, install, and stdio host
-├── orchestrator-providers/      # Built-in provider integrations and routing
 ├── orchestrator-session-host/   # Session backend layer + provider/plugin execution bridge
-├── orchestrator-store/          # Shared state/storage path helpers
 └── protocol/                    # Shared protocol/config/runtime types
 ```
 

CLAUDE.md

@@ -38,7 +38,7 @@ Animus is a Rust-only agent orchestrator with:
 
 Do not reintroduce stale claims such as:
 
-- stale workspace-count summaries that do not match `Cargo.toml`'s current 15 members
+- stale workspace-count summaries that do not match `Cargo.toml`'s current 13 members
 - "plugin extraction in flux" or "in progress" framing — extraction is complete as of v0.4.12
 - `PROJECT_ROOT` or "last-project-root registry" resolution rules
 - removed crates like `llm-mcp-server`, `llm-cli-wrapper`, `orchestrator-web-api`, `orchestrator-web-contracts`, or in-tree `animus-provider-{claude,codex,gemini,opencode,oai}`. `orchestrator-web-server` still exists in-repo but is not a current workspace member
@@ -51,16 +51,14 @@ Do not reintroduce stale claims such as:
 Core orchestration:
 
 - `crates/orchestrator-cli`
-- `crates/orchestrator-core`
+- `crates/orchestrator-core` (includes the folded-in `subject_adapter` and `store` modules as of v0.5.3)
 - `crates/orchestrator-config`
-- `crates/orchestrator-store`
 - `crates/protocol`
 
 Runtime and provider layer:
 
 - `crates/agent-runner`
 - `crates/orchestrator-daemon-runtime`
-- `crates/orchestrator-providers`
 - `crates/orchestrator-notifications`
 - `crates/orchestrator-session-host`
 - `crates/orchestrator-logging`

CONTRIBUTING.md

@@ -54,10 +54,10 @@ cargo animus-lint
 
 The workspace is organized into functional crates:
 
-- **Core orchestration**: `orchestrator-cli`, `orchestrator-core`, `orchestrator-config`, `orchestrator-store`
+- **Core orchestration**: `orchestrator-cli`, `orchestrator-core` (includes the v0.5.3 folded-in `subject_adapter` and `store` modules), `orchestrator-config`
 - **Runtime & agents**: `agent-runner`, `animus-runtime-shared`, `orchestrator-daemon-runtime`, `orchestrator-session-host`
 - **Plugin host**: `orchestrator-plugin-host`, `animus-plugin-protocol`, `animus-plugin-runtime`
-- **Utilities**: `orchestrator-providers`, `orchestrator-notifications`, `protocol`
+- **Utilities**: `orchestrator-notifications`, `protocol`
 - **Web stack**: shipped as external plugins (`launchapp-dev/animus-transport-http`, `animus-transport-graphql`, `animus-web-ui`). Install with `animus plugin install-defaults --include-transports`.
 
 ### Running Tests

Cargo.toml

@@ -10,10 +10,8 @@ members = [
   "crates/orchestrator-plugin-host",
   "crates/orchestrator-config",
   "crates/orchestrator-core",
-  "crates/orchestrator-store",
   "crates/orchestrator-cli",
   "crates/animus-runtime-shared",
-  "crates/orchestrator-providers",
   "crates/orchestrator-session-host",
 ]
 default-members = [
@@ -42,9 +40,7 @@ orchestrator-logging = { path = "crates/orchestrator-logging" }
 orchestrator-plugin-host = { path = "crates/orchestrator-plugin-host" }
 orchestrator-config = { path = "crates/orchestrator-config" }
 orchestrator-core = { path = "crates/orchestrator-core" }
-orchestrator-providers = { path = "crates/orchestrator-providers" }
 orchestrator-session-host = { path = "crates/orchestrator-session-host" }
-orchestrator-store = { path = "crates/orchestrator-store" }
 # v0.5.1 round-5 fold-in: the in-tree `workflow-runner-v2` lib was deleted
 # in favour of `animus-runtime-shared`. The crate is also published as
 # `launchapp-dev/animus-runtime-shared` v0.1.0 for the plugin to consume;

crates/animus-runtime-shared/Cargo.toml

@@ -31,15 +31,15 @@ uuid = { version = "1", features = ["v4", "serde"] }
 interprocess = "2.4"
 
 # When vendored inside the ao-cli workspace this crate uses the in-tree
-# `protocol` / `orchestrator-core` / `orchestrator-config` /
-# `orchestrator-store` workspace members. The out-of-tree
-# `launchapp-dev/animus-runtime-shared` repo replaces these with `git` deps
-# pinned to a `launchapp-dev/animus-cli` rev — keep both in sync when
-# pushing a new shared-crate version.
+# `protocol` / `orchestrator-core` / `orchestrator-config` workspace
+# members. The out-of-tree `launchapp-dev/animus-runtime-shared` repo
+# replaces these with `git` deps pinned to a `launchapp-dev/animus-cli`
+# rev — keep both in sync when pushing a new shared-crate version.
+# (v0.5.3 surface-shrink: `orchestrator-store` was folded into
+# `orchestrator-core::store`; `fsync_rename` is re-exported from there.)
 protocol            = { workspace = true }
 orchestrator-core   = { workspace = true }
 orchestrator-config = { workspace = true }
-orchestrator-store  = { workspace = true }
 
 [features]
 # Exposes the `phase_session::test_fault` and `phase_output::test_fault`

crates/animus-runtime-shared/src/agent_state.rs

@@ -80,7 +80,7 @@ where
 
 // Agent memory writes use the same durable pattern as session checkpoints:
 // fsync the staged tempfile, atomic rename, then fsync the parent dir so
-// the rename survives power loss. See `orchestrator_store::fsync_rename`
+// the rename survives power loss. See `orchestrator_core::store::fsync_rename`
 // for the macOS F_FULLFSYNC caveat.
 fn write_json_atomic<T>(path: &Path, value: &T) -> Result<()>
 where
@@ -102,7 +102,7 @@ where
         file.write_all(payload.as_bytes()).with_context(|| format!("failed to write {}", tmp_path.display()))?;
         file.sync_all().with_context(|| format!("failed to fsync {}", tmp_path.display()))?;
     }
-    orchestrator_store::fsync_rename(&tmp_path, path)
+    orchestrator_core::store::fsync_rename(&tmp_path, path)
         .with_context(|| format!("failed to durably rename {} -> {}", tmp_path.display(), path.display()))?;
     Ok(())
 }

crates/animus-runtime-shared/src/ensure_execution_cwd.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use orchestrator_core::{providers::SubjectContext, services::ServiceHub, SubjectRef};
+use orchestrator_core::{services::ServiceHub, subject_adapter::SubjectContext, SubjectRef};
 use std::sync::Arc;
 
 pub async fn ensure_execution_cwd(

crates/animus-runtime-shared/src/phase_output.rs

@@ -56,7 +56,7 @@ pub fn write_phase_completion_marker(
     // even though the data file is fully on disk. ~5-50ms on SSD —
     // negligible vs. the cost of replaying a completed phase or, worse,
     // double-running one.
-    orchestrator_store::fsync_rename(&tmp_path, &final_path)?;
+    orchestrator_core::store::fsync_rename(&tmp_path, &final_path)?;
     Ok(())
 }
 
@@ -241,7 +241,7 @@ pub fn persist_phase_output(
     // change is durable across power loss. Without this the recovery
     // logic could find a completion marker without the sibling
     // <phase>.json (or vice versa) after a kernel panic.
-    orchestrator_store::fsync_rename(&tmp_path, &file_path)?;
+    orchestrator_core::store::fsync_rename(&tmp_path, &file_path)?;
     if !matches!(outcome, PhaseExecutionOutcome::ManualPending { .. }) {
         write_phase_completion_marker(project_root, workflow_id, phase_id, attempt)?;
     }

crates/animus-runtime-shared/src/phase_session.rs

@@ -268,7 +268,7 @@ fn write_atomic(path: &Path, checkpoint: &SessionCheckpoint) -> io::Result<()> {
         file.write_all(&payload)?;
         file.sync_all()?;
     }
-    orchestrator_store::fsync_rename(&tmp, path)
+    orchestrator_core::store::fsync_rename(&tmp, path)
 }
 
 fn sanitize(value: &str) -> String {

crates/orchestrator-core/Cargo.toml

@@ -18,18 +18,14 @@ fs2 = "0.4"
 sha2 = "0.10"
 rusqlite = { version = "0.31", features = ["bundled", "blob"] }
 zstd = "0.13"
+tempfile = "3"
 protocol = { path = "../protocol" }
 animus-plugin-protocol = { workspace = true }
 orchestrator-plugin-host = { workspace = true }
-orchestrator-providers = { workspace = true }
-orchestrator-store = { workspace = true }
 orchestrator-config = { workspace = true }
 orchestrator-logging = { workspace = true }
 which = "8"
 toml = "1.0"
 
-[dev-dependencies]
-tempfile = "3"
-
 [lints]
 workspace = true