Skip to content

Commit 1f64323

Browse files
committed
merge: v0.5.3 SESSION-FOLD — orchestrator-session-host into orchestrator-plugin-host::session
- crates/orchestrator-session-host/src/*.rs → crates/orchestrator-plugin-host/src/session/ (5 files, ~2406 LOC) - crates/orchestrator-session-host/tests/plugin_supervisor.rs → crates/orchestrator-plugin-host/tests/plugin_supervisor.rs - plugin-host absorbs session-host's deps: animus-session-backend, orchestrator-logging, async-trait, uuid (with rt-multi-thread tokio feature) - session/mod.rs re-exports session-host's old top-level surface; consumers now use orchestrator_plugin_host::session::... (no top-level plugin-host re-export — namespace boundary stays visible) - 6 import sites updated across agent-runner, orchestrator-cli, orchestrator-daemon-runtime Workspace: 13 → 12 crates (after CORE-FOLD's earlier 15 → 13). Merge conflicts in CLAUDE.md / AGENTS.md / CONTRIBUTING.md / Cargo.toml / docs/architecture/{full-system-architecture,runtime-architecture}.md / docs/contributing/development.md resolved by keeping NEITHER side's stale entries (both CORE-FOLD and SESSION-FOLD dropped different crates from the same workspace lists). The session/ module + lib.rs registration + plugin-host Cargo.toml + tests/plugin_supervisor.rs were restored from the SESSION-FOLD branch after git's auto-resolve kept HEAD's pre-fold state. Branch: worktree-agent-a6866552122972629 (commit 73338b8).
1 parent f3a69d1 commit 1f64323

25 files changed

Lines changed: 46 additions & 315 deletions

File tree

AGENTS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ crates/
4545
├── orchestrator-daemon-runtime/ # Daemon queue and scheduling runtime
4646
├── orchestrator-logging/ # Shared tracing and log file utilities
4747
├── orchestrator-notifications/ # Notification/runtime integration support
48-
├── orchestrator-plugin-host/ # Plugin discovery, install, and stdio host
49-
├── orchestrator-session-host/ # Session backend layer + provider/plugin execution bridge
48+
├── orchestrator-plugin-host/ # Plugin discovery, install, stdio host, session backend bridge (folded in v0.5.3)
5049
└── protocol/ # Shared protocol/config/runtime types
5150
```
5251

CLAUDE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Animus is a Rust-only agent orchestrator with:
3838

3939
Do not reintroduce stale claims such as:
4040

41-
- stale workspace-count summaries that do not match `Cargo.toml`'s current 13 members
41+
- stale workspace-count summaries that do not match `Cargo.toml`'s current 12 members
4242
- "plugin extraction in flux" or "in progress" framing — extraction is complete as of v0.4.12
4343
- `PROJECT_ROOT` or "last-project-root registry" resolution rules
4444
- 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
@@ -60,7 +60,6 @@ Runtime and provider layer:
6060
- `crates/agent-runner`
6161
- `crates/orchestrator-daemon-runtime`
6262
- `crates/orchestrator-notifications`
63-
- `crates/orchestrator-session-host`
6463
- `crates/orchestrator-logging`
6564

6665
Plugin host + protocol:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ cargo animus-lint
5555
The workspace is organized into functional crates:
5656

5757
- **Core orchestration**: `orchestrator-cli`, `orchestrator-core` (includes the v0.5.3 folded-in `subject_adapter` and `store` modules), `orchestrator-config`
58-
- **Runtime & agents**: `agent-runner`, `animus-runtime-shared`, `orchestrator-daemon-runtime`, `orchestrator-session-host`
59-
- **Plugin host**: `orchestrator-plugin-host`, `animus-plugin-protocol`, `animus-plugin-runtime`
58+
- **Runtime & agents**: `agent-runner`, `animus-runtime-shared`, `orchestrator-daemon-runtime`
59+
- **Plugin host**: `orchestrator-plugin-host` (includes `session::*` folded in v0.5.3), `animus-plugin-protocol`, `animus-plugin-runtime`
6060
- **Utilities**: `orchestrator-notifications`, `protocol`
6161
- **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`.
6262

0 commit comments

Comments
 (0)