Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: gate workspace memory lifecycle authority

Browse Source
This commit is contained in:
Hare
2026-09-04 20:53:27 +09:00
parent d1f5661881
commit 5ee77698db
3 changed files with 93 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/worker/src/controller.rs
+53 -9
View File
@@ -904,6 +904,7 @@ pub(crate) fn wire_event_bridges_on_engine<C, St>(
fn add_memory_lifecycle_if_configured<M>(
registry: &mut FeatureRegistryBuilder,
config: Option<manifest::MemoryConfig>,
workspace_bound: bool,
build: impl FnOnce(manifest::MemoryConfig) -> std::io::Result<M>,
) -> std::io::Result<bool>
where
@@ -912,6 +913,15 @@ where
let Some(config) = config else {
return Ok(false);
};
if config.workspace_settings().is_none() {
if workspace_bound {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
"Workspace-bound Memory requires a Backend-authored settings snapshot",
));
}
return Ok(false);
}
registry.add_module(build(config)?);
Ok(true)
}
@@ -1009,7 +1019,14 @@ where
let worker_enabled = feature_config.worker.enabled;
let sub_worker_enabled = feature_config.sub_worker.enabled;
let mut feature_registry = FeatureRegistryBuilder::new();
add_memory_lifecycle_if_configured(&mut feature_registry, memory_config.clone(), |config| {
add_memory_lifecycle_if_configured(
&mut feature_registry,
worker
.manifest_lifecycle_features_enabled()
.then(|| memory_config.clone())
.flatten(),
spawner_workspace_context.workspace_id().is_some(),
|config| {
let workspace_client = worker.workspace_client_handle();
if !workspace_client.is_available() || workspace_client.workspace_id().is_none() {
return Err(std::io::Error::new(
@@ -1030,7 +1047,8 @@ where
worker.working_event_sender(),
),
)
})?;
},
)?;
if sub_worker_enabled && !worker_enabled {
feature_registry.add_module(
crate::feature::builtin::manage_worker::sub_worker_control_feature(
@@ -2151,7 +2169,7 @@ mod tests {
use tokio::net::UnixListener;
#[test]
fn memory_lifecycle_registration_depends_only_on_memory_config_presence() {
fn memory_lifecycle_registration_requires_bound_workspace_memory_config() {
#[derive(Clone)]
struct TestMemoryLifecycleModule;
@@ -2173,14 +2191,17 @@ mod tests {
let mut registry = FeatureRegistryBuilder::new();
let configured = std::cell::Cell::new(false);
let installed = add_memory_lifecycle_if_configured(
&mut registry,
Some(manifest::MemoryConfig::default()),
|_| {
let mut memory_config = manifest::MemoryConfig::default();
memory_config.bind_workspace_settings(&manifest::WorkspaceMemorySettingsSnapshot {
workspace_id: "workspace-1".to_string(),
settings_revision: 1,
language: "English".to_string(),
});
let installed =
add_memory_lifecycle_if_configured(&mut registry, Some(memory_config), true, |_| {
configured.set(true);
Ok(TestMemoryLifecycleModule)
},
)
})
.unwrap();
assert!(installed);
assert!(configured.get());
@@ -2189,10 +2210,33 @@ mod tests {
let installed = add_memory_lifecycle_if_configured::<TestMemoryLifecycleModule>(
&mut registry,
None,
false,
|_| panic!("disabled Memory must not construct its lifecycle Feature"),
)
.unwrap();
assert!(!installed);
let installed = add_memory_lifecycle_if_configured::<TestMemoryLifecycleModule>(
&mut registry,
Some(manifest::MemoryConfig::default()),
false,
|_| panic!("Memory without a Backend-authored settings snapshot must stay disabled"),
)
.unwrap();
assert!(!installed);
let error = add_memory_lifecycle_if_configured::<TestMemoryLifecycleModule>(
&mut registry,
Some(manifest::MemoryConfig::default()),
true,
|_| panic!("invalid Workspace Memory config must fail before Feature construction"),
)
.unwrap_err();
assert!(
error
.to_string()
.contains("Backend-authored settings snapshot")
);
}
#[test]
crates/worker/src/internal_worker.rs
+3
View File
@@ -164,6 +164,7 @@ where
identity: identity.clone(),
history_entries: 0,
})?;
worker.disable_manifest_lifecycle_features();
if let Some(session) = inherited_workdir_session {
worker.bind_workdir_session(Some(session));
}
@@ -578,6 +579,7 @@ pub(crate) async fn spawn_internal_worker_session(
.map_err(|source| InternalWorkerSessionError::Build {
message: source.to_string(),
})?;
worker.disable_manifest_lifecycle_features();
if let Some(session) = inherited_workdir_session {
worker.bind_workdir_session(Some(session));
}
@@ -671,6 +673,7 @@ pub(crate) fn prepare_internal_worker_from_spec(
.map_err(|source| InternalWorkerSessionError::Build {
message: source.to_string(),
})?;
worker.disable_manifest_lifecycle_features();
if let Some(session) = inherited_workdir_session {
worker.bind_workdir_session(Some(session));
}
crates/worker/src/worker.rs
+16
View File
@@ -1130,6 +1130,9 @@ pub struct Worker<C: LlmClient, St: Store> {
hook_registry: Option<Arc<HookRegistry>>,
/// Executable background tasks registered by successfully installed features.
feature_background_tasks: FeatureBackgroundTaskRegistry,
/// Internal Workers install an explicit Feature composition and disable
/// manifest-derived lifecycle Features before controller startup.
manifest_lifecycle_features_enabled: bool,
interceptor_installed: bool,
/// Shared compaction state (present when threshold is configured).
compact_state: Option<Arc<CompactState>>,
@@ -1423,6 +1426,7 @@ impl<C: LlmClient + 'static, St: Store> Worker<C, St> {
hook_builder: HookRegistryBuilder::new(),
hook_registry: None,
feature_background_tasks: FeatureBackgroundTaskRegistry::default(),
manifest_lifecycle_features_enabled: true,
interceptor_installed: false,
compact_state: None,
usage_tracker: Arc::new(UsageTracker::new()),
@@ -1800,6 +1804,14 @@ impl<C: LlmClient + 'static, St: Store> Worker<C, St> {
self.session.replace_history(entries);
}
pub(crate) fn disable_manifest_lifecycle_features(&mut self) {
self.manifest_lifecycle_features_enabled = false;
}
pub(crate) fn manifest_lifecycle_features_enabled(&self) -> bool {
self.manifest_lifecycle_features_enabled
}
/// Install enabled feature modules into the Worker host surfaces.
pub fn install_features(
&mut self,
@@ -4676,6 +4688,7 @@ where
hook_builder: HookRegistryBuilder::new(),
hook_registry: None,
feature_background_tasks: FeatureBackgroundTaskRegistry::default(),
manifest_lifecycle_features_enabled: true,
interceptor_installed: false,
compact_state: None,
usage_tracker: Arc::new(UsageTracker::new()),
@@ -4757,6 +4770,7 @@ where
hook_builder: HookRegistryBuilder::new(),
hook_registry: None,
feature_background_tasks: FeatureBackgroundTaskRegistry::default(),
manifest_lifecycle_features_enabled: false,
interceptor_installed: false,
compact_state: None,
usage_tracker: Arc::new(UsageTracker::new()),
@@ -4873,6 +4887,7 @@ where
hook_builder: HookRegistryBuilder::new(),
hook_registry: None,
feature_background_tasks: FeatureBackgroundTaskRegistry::default(),
manifest_lifecycle_features_enabled: true,
interceptor_installed: false,
compact_state: None,
usage_tracker: Arc::new(UsageTracker::new()),
@@ -5243,6 +5258,7 @@ where
hook_builder: HookRegistryBuilder::new(),
hook_registry: None,
feature_background_tasks: FeatureBackgroundTaskRegistry::default(),
manifest_lifecycle_features_enabled: true,
interceptor_installed: false,
compact_state: None,
usage_tracker: Arc::new(UsageTracker::new()),