services: fold fwmanager into orchestrator Move services/fwmanager/{api,hal-adapters} to services/orchestrator/, rename the fwmanager_api and fwmanager_hal_adapters crates to match, and update the remaining fwmanager mentions in the sm doc comments and target/mock.

diff --git a/services/fwmanager/api/BUILD.bazel b/services/orchestrator/api/BUILD.bazel
similarity index 80%
rename from services/fwmanager/api/BUILD.bazel
rename to services/orchestrator/api/BUILD.bazel
index 49662ed..0dfcdbd 100644
--- a/services/fwmanager/api/BUILD.bazel
+++ b/services/orchestrator/api/BUILD.bazel

@@ -4,7 +4,7 @@
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 
 rust_library(
-    name = "fwmanager_api",
+    name = "orchestrator_api",
     srcs = [
         "src/boot_control.rs",
         "src/boot_monitor.rs",
@@ -17,6 +17,6 @@
 
 # Host tests: build on the host platform, no kernel/QEMU.
 rust_test(
-    name = "fwmanager_api_test",
-    crate = ":fwmanager_api",
+    name = "orchestrator_api_test",
+    crate = ":orchestrator_api",
 )

diff --git a/services/fwmanager/api/src/boot_control.rs b/services/orchestrator/api/src/boot_control.rs
similarity index 100%
rename from services/fwmanager/api/src/boot_control.rs
rename to services/orchestrator/api/src/boot_control.rs


diff --git a/services/fwmanager/api/src/boot_monitor.rs b/services/orchestrator/api/src/boot_monitor.rs
similarity index 100%
rename from services/fwmanager/api/src/boot_monitor.rs
rename to services/orchestrator/api/src/boot_monitor.rs


diff --git a/services/fwmanager/api/src/config.rs b/services/orchestrator/api/src/config.rs
similarity index 100%
rename from services/fwmanager/api/src/config.rs
rename to services/orchestrator/api/src/config.rs


diff --git a/services/fwmanager/api/src/lib.rs b/services/orchestrator/api/src/lib.rs
similarity index 93%
rename from services/fwmanager/api/src/lib.rs
rename to services/orchestrator/api/src/lib.rs
index f379d10..02dad99 100644
--- a/services/fwmanager/api/src/lib.rs
+++ b/services/orchestrator/api/src/lib.rs

@@ -15,7 +15,7 @@
 //! downward on it. Concrete adapters bind a trait to a signal source and
 //! live in their own crates, so naming a capability never drags in the stack
 //! behind it — the HAL-backed `HalBootControl` and `GpioBootMonitor` are in
-//! `fwmanager-hal-adapters`; other backends (for example an MCTP-ready
+//! `orchestrator-hal-adapters`; other backends (for example an MCTP-ready
 //! `BootMonitor`) implement the same traits from their own transport crate.
 //! Config values live in the board device tables
 //! (`target/<board>/devices.rs`).

diff --git a/services/fwmanager/hal-adapters/BUILD.bazel b/services/orchestrator/hal-adapters/BUILD.bazel
similarity index 71%
rename from services/fwmanager/hal-adapters/BUILD.bazel
rename to services/orchestrator/hal-adapters/BUILD.bazel
index 14e65f0..ccbbde9 100644
--- a/services/fwmanager/hal-adapters/BUILD.bazel
+++ b/services/orchestrator/hal-adapters/BUILD.bazel

@@ -4,7 +4,7 @@
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 
 rust_library(
-    name = "fwmanager_hal_adapters",
+    name = "orchestrator_hal_adapters",
     srcs = [
         "src/gpio_boot_monitor.rs",
         "src/hal_boot_control.rs",
@@ -14,12 +14,12 @@
     visibility = ["//visibility:public"],
     deps = [
         "//hal/blocking",
-        "//services/fwmanager/api:fwmanager_api",
+        "//services/orchestrator/api:orchestrator_api",
     ],
 )
 
 # Host tests: build on the host platform, no kernel/QEMU.
 rust_test(
-    name = "fwmanager_hal_adapters_test",
-    crate = ":fwmanager_hal_adapters",
+    name = "orchestrator_hal_adapters_test",
+    crate = ":orchestrator_hal_adapters",
 )

diff --git a/services/fwmanager/hal-adapters/src/gpio_boot_monitor.rs b/services/orchestrator/hal-adapters/src/gpio_boot_monitor.rs
similarity index 99%
rename from services/fwmanager/hal-adapters/src/gpio_boot_monitor.rs
rename to services/orchestrator/hal-adapters/src/gpio_boot_monitor.rs
index d8bf0e1..bc02fd3 100644
--- a/services/fwmanager/hal-adapters/src/gpio_boot_monitor.rs
+++ b/services/orchestrator/hal-adapters/src/gpio_boot_monitor.rs

@@ -4,10 +4,10 @@
 //! HAL-backed [`BootMonitor`]: read a device's boot-complete signal off a GPIO
 //! input line.
 
-use fwmanager_api::{BootMonitor, BootStatus};
 use openprot_hal_blocking::gpio_port::{
     ActivePolarity, GpioError, GpioErrorKind, GpioPort, PinMask,
 };
+use orchestrator_api::{BootMonitor, BootStatus};
 
 /// Adapts any HAL GPIO error into a [`core::error::Error`].
 ///

diff --git a/services/fwmanager/hal-adapters/src/hal_boot_control.rs b/services/orchestrator/hal-adapters/src/hal_boot_control.rs
similarity index 99%
rename from services/fwmanager/hal-adapters/src/hal_boot_control.rs
rename to services/orchestrator/hal-adapters/src/hal_boot_control.rs
index b4ef418..e434aa0 100644
--- a/services/fwmanager/hal-adapters/src/hal_boot_control.rs
+++ b/services/orchestrator/hal-adapters/src/hal_boot_control.rs

@@ -3,8 +3,8 @@
 
 //! HAL-backed [`BootControl`]: bind one reset-controller line to a device.
 
-use fwmanager_api::BootControl;
 use openprot_hal_blocking::system_control::{Error as HalError, ErrorKind, ResetControl};
+use orchestrator_api::BootControl;
 
 /// Adapts any HAL system-control error into a [`core::error::Error`].
 ///

diff --git a/services/fwmanager/hal-adapters/src/lib.rs b/services/orchestrator/hal-adapters/src/lib.rs
similarity index 80%
rename from services/fwmanager/hal-adapters/src/lib.rs
rename to services/orchestrator/hal-adapters/src/lib.rs
index f4eb93c..179d2d4 100644
--- a/services/fwmanager/hal-adapters/src/lib.rs
+++ b/services/orchestrator/hal-adapters/src/lib.rs

@@ -3,11 +3,11 @@
 
 //! HAL-backed adapters for the Boot Orchestrator capability traits.
 //!
-//! Each type here implements a capability trait from `fwmanager-api` against
+//! Each type here implements a capability trait from `orchestrator-api` against
 //! a HAL-blocking trait: [`HalBootControl`] drives `BootControl` over a
 //! `ResetControl` line, and [`GpioBootMonitor`] reads `BootMonitor` off a
 //! `GpioPort` input line. Adapters live in this crate — not in the leaf
-//! `fwmanager-api` — so that depending on a capability contract never pulls
+//! `orchestrator-api` — so that depending on a capability contract never pulls
 //! in the HAL. A transport-backed adapter belongs in its own crate depending
 //! on its own stack, by the same rule.
 

diff --git a/services/orchestrator/sm/src/lib.rs b/services/orchestrator/sm/src/lib.rs
index 5fe7e25..29e1f17 100644
--- a/services/orchestrator/sm/src/lib.rs
+++ b/services/orchestrator/sm/src/lib.rs

@@ -134,7 +134,7 @@
 /// gated out. The walk-phase payloads (`AwaitingReady`/`Recovering`) stay on the
 /// global [`State`] rather than here — those phases are properties of the whole
 /// machine, not of one component. Named for the *component service* axis to keep
-/// it distinct from fwmanager's trial-boot/commit (update-slot) lifecycle, which
+/// it distinct from orchestrator-api's trial-boot/commit (update-slot) lifecycle, which
 /// is a separate concern.
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 enum ComponentLifecycle {

diff --git a/services/orchestrator/sm/src/model.rs b/services/orchestrator/sm/src/model.rs
index ae9cfd8..782bb95 100644
--- a/services/orchestrator/sm/src/model.rs
+++ b/services/orchestrator/sm/src/model.rs

@@ -194,7 +194,7 @@
     /// up. The passive-tier counterpart to [`Event::ComponentReady`]: a passive
     /// component has no iRoT to self-verify, so "it booted" is the only
     /// post-release signal it can produce. Clears that component's boot-progress
-    /// watchdog. Mirrors fwmanager's `BootProgress::Booted`.
+    /// watchdog. Mirrors orchestrator-api's `BootProgress::Booted`.
     Booted(ComponentId),
     /// A challenger has requested a signed attestation.
     AttestationChallenge,

diff --git a/services/orchestrator/sm/src/tests.rs b/services/orchestrator/sm/src/tests.rs
index 60bf6ef..df188ba 100644
--- a/services/orchestrator/sm/src/tests.rs
+++ b/services/orchestrator/sm/src/tests.rs

@@ -603,7 +603,7 @@
 /// never reports [`Event::Booted`] before its watchdog fires is recovered like
 /// any other boot failure — even while the walk is still in `PreSupervision`.
 /// This closes the release-and-forget gap (CSA boot-progress checkpointing is
-/// device-agnostic; fwmanager arms a `boot_timeout` for every device).
+/// device-agnostic; the orchestrator arms a `boot_timeout` for every device).
 #[test]
 fn passive_boot_timeout_enters_recovering() {
     let (effects, state) = drive(

diff --git a/target/mock/BUILD.bazel b/target/mock/BUILD.bazel
index ddf861b..803102f 100644
--- a/target/mock/BUILD.bazel
+++ b/target/mock/BUILD.bazel

@@ -10,5 +10,5 @@
     srcs = ["devices.rs"],
     crate_name = "board_devices",
     edition = "2024",
-    deps = ["//services/fwmanager/api:fwmanager_api"],
+    deps = ["//services/orchestrator/api:orchestrator_api"],
 )

diff --git a/target/mock/devices.rs b/target/mock/devices.rs
index ea5b7df..0cb4d54 100644
--- a/target/mock/devices.rs
+++ b/target/mock/devices.rs

@@ -9,7 +9,7 @@
 
 use core::time::Duration;
 
-use fwmanager_api::config::{BootCheckpoint, BootSignal, CommitPolicy, DeviceConfig};
+use orchestrator_api::config::{BootCheckpoint, BootSignal, CommitPolicy, DeviceConfig};
 
 /// Declaration order is the boot order: the orchestrator releases devices
 /// top to bottom, one at a time.
@@ -50,4 +50,4 @@
     },
 ];
 
-const _: () = fwmanager_api::config::validate(MANAGED_DEVICES);
+const _: () = orchestrator_api::config::validate(MANAGED_DEVICES);