Commit 1f64323
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
- crates
- agent-runner
- src/runner
- orchestrator-cli
- src/services
- operations
- runtime/runtime_daemon
- tests
- orchestrator-daemon-runtime
- src
- orchestrator-plugin-host
- src
- session
- tests
- orchestrator-session-host
- docs
- architecture
- contributing
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
| 48 | + | |
50 | 49 | | |
51 | 50 | | |
52 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
59 | | - | |
| 58 | + | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
0 commit comments