From 8be2cfd2a33390fbe054a287fd05e599388156bc Mon Sep 17 00:00:00 2001 From: Hare Date: Mon, 17 Aug 2026 00:18:49 +0900 Subject: [PATCH] worker: unify granted Worker control --- crates/worker/src/controller.rs | 3 - .../src/feature/builtin/manage_worker.rs | 846 +++++++++++++----- .../src/feature/builtin/worker_observation.rs | 53 +- crates/worker/src/spawn/comm_tools.rs | 8 +- crates/workspace-server/src/hosts.rs | 36 + crates/workspace-server/src/server.rs | 598 +++++++++++-- crates/workspace-server/src/store.rs | 56 +- resources/profiles/base.dcdl | 4 +- resources/profiles/coder.dcdl | 2 +- 9 files changed, 1304 insertions(+), 302 deletions(-) diff --git a/crates/worker/src/controller.rs b/crates/worker/src/controller.rs index 5e696c3b..ebb07952 100644 --- a/crates/worker/src/controller.rs +++ b/crates/worker/src/controller.rs @@ -21,7 +21,6 @@ use crate::shutdown_after_idle::{ ShutdownAfterIdleRequest, TicketIntakeReadyShutdownHook, is_ticket_intake_role, take_shutdown_request_after_status, }; -use crate::spawn::comm_tools::{sub_worker_send_tool, sub_worker_stop_tool}; use crate::spawn::registry::SpawnedWorkerRegistry; use crate::spawn::tool::sub_worker_spawn_tool; use crate::worker::{ @@ -921,8 +920,6 @@ where scope_handle, prompts, )); - engine.register_tool(sub_worker_send_tool(spawned_registry.clone())); - engine.register_tool(sub_worker_stop_tool(spawned_registry.clone())); observation_providers.push(Arc::new( crate::feature::builtin::worker_observation::SpawnedSubWorkerObservationProvider::new( spawned_registry, diff --git a/crates/worker/src/feature/builtin/manage_worker.rs b/crates/worker/src/feature/builtin/manage_worker.rs index 73aff8bc..a66a531c 100644 --- a/crates/worker/src/feature/builtin/manage_worker.rs +++ b/crates/worker/src/feature/builtin/manage_worker.rs @@ -30,12 +30,224 @@ pub const WORKER_LIFECYCLE_SERVICE_ID: &str = "worker.lifecycle"; pub const WORKER_CONTROL_SERVICE_ID: &str = "worker.control"; const WORKER_LIFECYCLE_SERVICE_VERSION: &str = "1"; -pub trait WorkerControlService: Send + Sync {} +#[async_trait] +pub trait WorkerControlService: Send + Sync { + fn workspace_id(&self) -> &str; + fn known_subworkers(&self) -> Vec; + async fn send_subworker( + &self, + name: &str, + content: String, + ) -> Result; + async fn stop_subworker(&self, name: &str) -> Result; + async fn spawn_worker( + &self, + request: WorkerLifecycleSpawnRequest, + ) -> Result; + fn remove_runtime_worker( + &self, + runtime_id: &str, + worker_id: &str, + expected_worker_revision: &str, + reason: &str, + ) -> Result; + async fn execute_runtime( + &self, + request: WorkspaceRequest, + ) -> Result; + async fn ensure_permission( + &self, + subject: &super::worker_observation::WorkerObservationSubjectRef, + permission: &str, + ) -> Result<(), WorkspaceClientError>; +} -#[derive(Debug)] -struct WorkspaceWorkerControlService; +struct WorkspaceWorkerControlService { + client: Arc, + workspace_id: String, + registry: Option>, +} -impl WorkerControlService for WorkspaceWorkerControlService {} +impl std::fmt::Debug for WorkspaceWorkerControlService { + fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter + .debug_struct("WorkspaceWorkerControlService") + .field("workspace_id", &self.workspace_id) + .field("has_subworker_registry", &self.registry.is_some()) + .finish_non_exhaustive() + } +} + +#[async_trait] +impl WorkerControlService for WorkspaceWorkerControlService { + fn workspace_id(&self) -> &str { + &self.workspace_id + } + + fn known_subworkers(&self) -> Vec { + self.registry + .as_ref() + .map(|registry| { + registry + .list_internal() + .into_iter() + .map(|internal| { + serde_json::json!({ + "subject": { "kind": "sub_worker", "name": internal.worker_name }, + "relation": "direct_child", + "origin": "sub_worker_spawn", + "permissions": ["send_input", "stop", "observe"], + "summary": { + "display_name": internal.worker_name, + "status": format!("{:?}", internal.session.status()).to_lowercase(), + } + }) + }) + .collect() + }) + .unwrap_or_default() + } + + async fn send_subworker( + &self, + name: &str, + content: String, + ) -> Result { + let record = self + .registry + .as_ref() + .and_then(|registry| registry.get_internal(name)) + .ok_or_else(|| { + WorkspaceClientError::Request( + "unknown Worker or permission not granted".to_string(), + ) + })?; + record + .session + .send(content) + .await + .map_err(|error| WorkspaceClientError::Request(error.to_string()))?; + Ok(WorkspaceResponse { + status: 200, + body: serde_json::json!({ "subject": { "kind": "sub_worker", "name": name } }) + .to_string(), + }) + } + + async fn stop_subworker(&self, name: &str) -> Result { + let registry = self.registry.as_ref().ok_or_else(|| { + WorkspaceClientError::Request("unknown Worker or permission not granted".to_string()) + })?; + registry + .remove_internal(name) + .await + .map_err(|error| WorkspaceClientError::Request(error.to_string()))?; + Ok(WorkspaceResponse { + status: 200, + body: serde_json::json!({ "subject": { "kind": "sub_worker", "name": name } }) + .to_string(), + }) + } + + async fn spawn_worker( + &self, + request: WorkerLifecycleSpawnRequest, + ) -> Result { + WorkspaceWorkerLifecycleService { + client: self.client.clone(), + workspace_id: self.workspace_id.clone(), + } + .spawn(request) + .await + } + + fn remove_runtime_worker( + &self, + runtime_id: &str, + worker_id: &str, + expected_worker_revision: &str, + reason: &str, + ) -> Result { + self.client + .execute_worker_remove(runtime_id, worker_id, expected_worker_revision, reason) + } + + async fn execute_runtime( + &self, + request: WorkspaceRequest, + ) -> Result { + self.client.execute(request) + } + + async fn ensure_permission( + &self, + subject: &super::worker_observation::WorkerObservationSubjectRef, + permission: &str, + ) -> Result<(), WorkspaceClientError> { + match subject { + super::worker_observation::WorkerObservationSubjectRef::SubWorker { name } => { + let known = self + .registry + .as_ref() + .and_then(|registry| registry.get_internal(name)) + .is_some(); + if known && matches!(permission, "send_input" | "stop" | "observe") { + Ok(()) + } else { + Err(WorkspaceClientError::Request( + "unknown Worker or permission not granted".to_string(), + )) + } + } + super::worker_observation::WorkerObservationSubjectRef::RuntimeWorker { + runtime_id, + worker_id, + } => { + let response = self.client.execute(WorkspaceRequest::get(format!( + "/api/w/{}/worker-control/workers", + self.workspace_id + )))?; + if !response.is_success() { + return Err(WorkspaceClientError::Request(format!( + "Workspace control request returned {}: {}", + response.status, response.body + ))); + } + let body: serde_json::Value = + serde_json::from_str(&response.body).map_err(|error| { + WorkspaceClientError::Request(format!( + "invalid Workspace control response: {error}" + )) + })?; + let granted = body + .get("items") + .and_then(serde_json::Value::as_array) + .into_iter() + .flatten() + .any(|item| { + item.get("subject") + .and_then(|value| value.get("runtime_id")) + == Some(&serde_json::Value::String(runtime_id.clone())) + && item.get("subject").and_then(|value| value.get("worker_id")) + == Some(&serde_json::Value::String(worker_id.clone())) + && item + .get("permissions") + .and_then(serde_json::Value::as_array) + .is_some_and(|permissions| { + permissions.iter().any(|candidate| candidate == permission) + }) + }); + if granted { + Ok(()) + } else { + Err(WorkspaceClientError::Request( + "unknown Worker or permission not granted".to_string(), + )) + } + } + } + } +} #[async_trait] pub trait WorkerLifecycleService: Send + Sync { @@ -108,7 +320,7 @@ impl WorkerLifecycleService for WorkspaceWorkerLifecycleService { #[derive(Clone)] pub struct ManageWorkerFeature { client: Arc, - registry: Option>, + control: Arc, direct_spawn: bool, } @@ -116,7 +328,10 @@ impl std::fmt::Debug for ManageWorkerFeature { fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { formatter .debug_struct("ManageWorkerFeature") - .field("has_registry", &self.registry.is_some()) + .field( + "has_subworker_registry", + &!self.control.known_subworkers().is_empty(), + ) .field("direct_spawn", &self.direct_spawn) .finish_non_exhaustive() } @@ -127,9 +342,15 @@ pub fn manage_worker_feature( registry: Option>, direct_spawn: bool, ) -> ManageWorkerFeature { + let workspace_id = client.workspace_id().unwrap_or_default().to_string(); + let control: Arc = Arc::new(WorkspaceWorkerControlService { + client: client.clone(), + workspace_id, + registry, + }); ManageWorkerFeature { client, - registry, + control, direct_spawn, } } @@ -189,57 +410,37 @@ impl FeatureModule for ManageWorkerFeature { WORKER_LIFECYCLE_SERVICE_VERSION, "Known-Worker discovery and permission-fenced control operations", ), - Arc::new(WorkspaceWorkerControlService) as Arc, + self.control.clone(), )?; for operation in WorkerOperation::ALL { if operation == WorkerOperation::Spawn && !self.direct_spawn { continue; } let definition = match operation { - WorkerOperation::List => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), - WorkerOperation::Spawn => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), + WorkerOperation::List => { + definition::(operation, self.control.clone()) + } + WorkerOperation::Spawn => { + definition::(operation, self.control.clone()) + } WorkerOperation::SendInput | WorkerOperation::Notify => { - definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ) + definition::(operation, self.control.clone()) + } + WorkerOperation::Cancel | WorkerOperation::Stop => { + definition::(operation, self.control.clone()) + } + WorkerOperation::Restore => { + definition::(operation, self.control.clone()) + } + WorkerOperation::Remove => { + definition::(operation, self.control.clone()) + } + WorkerOperation::Share | WorkerOperation::Transfer => { + definition::(operation, self.control.clone()) + } + WorkerOperation::Revoke => { + definition::(operation, self.control.clone()) } - WorkerOperation::Cancel => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), - WorkerOperation::Stop => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), - WorkerOperation::Restore => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), - WorkerOperation::Remove => definition::( - operation, - self.client.clone(), - workspace_id.clone(), - self.registry.clone(), - ), }; context .tools() @@ -298,26 +499,35 @@ struct WorkerWorkingDirectorySelection { relative_cwd: Option, } +#[derive(Debug, Clone, Deserialize, JsonSchema)] +#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)] +enum WorkerSubjectInput { + RuntimeWorker { + runtime_id: String, + worker_id: String, + }, + SubWorker { + name: String, + }, +} + #[derive(Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] struct WorkerTargetInput { - runtime_id: String, - worker_id: String, + subject: WorkerSubjectInput, } #[derive(Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] struct WorkerMessageInput { - runtime_id: String, - worker_id: String, + subject: WorkerSubjectInput, content: String, } #[derive(Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] struct WorkerStopInput { - runtime_id: String, - worker_id: String, + subject: WorkerSubjectInput, #[serde(default)] reason: Option, } @@ -325,17 +535,27 @@ struct WorkerStopInput { #[derive(Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] struct WorkerRemoveInput { - runtime_id: String, - worker_id: String, + subject: WorkerSubjectInput, expected_worker_revision: String, reason: String, } +#[derive(Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +struct WorkerRevokeInput { + grant_id: String, +} + +#[derive(Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +struct WorkerDelegateInput { + grant_id: String, + target_controller: WorkerSubjectInput, +} + struct WorkspaceWorkerTool { operation: WorkerOperation, - client: Arc, - workspace_id: String, - registry: Option>, + control: Arc, } #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -348,10 +568,13 @@ enum WorkerOperation { Stop, Restore, Remove, + Share, + Transfer, + Revoke, } impl WorkerOperation { - const ALL: [Self; 8] = [ + const ALL: [Self; 11] = [ Self::List, Self::Spawn, Self::SendInput, @@ -360,6 +583,9 @@ impl WorkerOperation { Self::Stop, Self::Restore, Self::Remove, + Self::Share, + Self::Transfer, + Self::Revoke, ]; fn tool_name(self) -> &'static str { @@ -372,6 +598,9 @@ impl WorkerOperation { Self::Stop => "WorkerStop", Self::Restore => "WorkerRestore", Self::Remove => "WorkerRemove", + Self::Share => "WorkerShare", + Self::Transfer => "WorkerTransfer", + Self::Revoke => "WorkerRevoke", } } @@ -393,6 +622,11 @@ impl WorkerOperation { Self::Remove => { "Remove an eligible stopped, unassigned, non-internal Worker. Supply the current Worker revision and a bounded reason; Backend validation and retention are authoritative." } + Self::Share => "Share one controlled Runtime Worker with another known Runtime Worker.", + Self::Transfer => { + "Transfer one controlled Runtime Worker to another known Runtime Worker." + } + Self::Revoke => "Revoke one durable Runtime Worker control grant owned by this Worker.", } } } @@ -405,10 +639,142 @@ impl Tool for WorkspaceWorkerTool { ctx: ToolExecutionContext, ) -> Result { let response = match self.operation { + WorkerOperation::List => { + parse::(input_json, "WorkerList")?; + let response = self + .control + .execute_runtime(WorkspaceRequest::get(format!( + "/api/w/{}/worker-control/workers", + self.control.workspace_id() + ))) + .await + .map_err(control_tool_error)?; + self.with_subworkers(response)? + } + WorkerOperation::Spawn => { + let input = parse::(input_json, "WorkerSpawn")?; + let ticket_id = input + .ticket_id + .map(|ticket_id| authority_id(&ticket_id, "ticket_id")) + .transpose()?; + let operation_id = ticket_id + .as_ref() + .map(|ticket_id| { + let call_id = non_empty(ctx.call_id.clone(), "tool call_id")?; + Ok::<_, ToolError>(format!("worker-spawn:{ticket_id}:{call_id}")) + }) + .transpose()?; + self.control + .spawn_worker(WorkerLifecycleSpawnRequest { + runtime_id: authority_id(&input.runtime_id, "runtime_id")?, + working_directory_id: authority_id( + &input.working_directory_id, + "working_directory_id", + )?, + relative_cwd: input + .relative_cwd + .map(|value| validate_relative_cwd(&value)) + .transpose()?, + profile: non_empty(input.profile, "profile")?, + ticket_id, + operation_id, + display_name: input + .display_name + .filter(|value| !value.trim().is_empty()) + .unwrap_or_else(|| "Workspace Worker".to_string()), + initial_submit: input.initial_submit, + }) + .await + .map_err(control_tool_error)? + } + WorkerOperation::SendInput | WorkerOperation::Notify => { + let input = parse::(input_json, self.operation.tool_name())?; + let content = non_empty(input.content, "content")?; + if content.len() > 16 * 1024 { + return Err(ToolError::ExecutionFailed( + "content must contain at most 16384 bytes".to_string(), + )); + } + match input.subject { + WorkerSubjectInput::SubWorker { name } => { + if self.operation != WorkerOperation::SendInput { + return Err(unsupported_subject(self.operation, "sub_worker")); + } + let subject = subworker_subject(&name)?; + self.control + .ensure_permission(&subject, "send_input") + .await + .map_err(control_tool_error)?; + self.control + .send_subworker(&name, content) + .await + .map_err(control_tool_error)? + } + subject @ WorkerSubjectInput::RuntimeWorker { .. } => { + let (runtime_id, worker_id) = + runtime_subject_ids(&subject, self.operation)?; + self.control.execute_runtime(WorkspaceRequest::json( + WorkspaceRequestMethod::Post, + format!("/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/input", self.control.workspace_id()), + serde_json::json!({ + "kind": if self.operation == WorkerOperation::Notify { "notify" } else { "user" }, + "content": content, + }).to_string(), + )).await.map_err(control_tool_error)? + } + } + } + WorkerOperation::Cancel | WorkerOperation::Stop => { + let input = parse::(input_json, self.operation.tool_name())?; + match input.subject { + WorkerSubjectInput::SubWorker { name } => { + if self.operation != WorkerOperation::Stop { + return Err(unsupported_subject(self.operation, "sub_worker")); + } + let subject = subworker_subject(&name)?; + self.control + .ensure_permission(&subject, "stop") + .await + .map_err(control_tool_error)?; + self.control + .stop_subworker(&name) + .await + .map_err(control_tool_error)? + } + subject @ WorkerSubjectInput::RuntimeWorker { .. } => { + let (runtime_id, worker_id) = + runtime_subject_ids(&subject, self.operation)?; + let action = if self.operation == WorkerOperation::Cancel { + "cancel" + } else { + "stop" + }; + self.control.execute_runtime(WorkspaceRequest::json( + WorkspaceRequestMethod::Post, + format!("/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/{action}", self.control.workspace_id()), + serde_json::json!({ "reason": input.reason }).to_string(), + )).await.map_err(control_tool_error)? + } + } + } + WorkerOperation::Restore => { + let input = parse::(input_json, "WorkerRestore")?; + let (runtime_id, worker_id) = runtime_subject_ids(&input.subject, self.operation)?; + self.control + .execute_runtime(WorkspaceRequest::json( + WorkspaceRequestMethod::Post, + format!( + "/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/restore", + self.control.workspace_id() + ), + "{}", + )) + .await + .map_err(control_tool_error)? + } WorkerOperation::Remove => { let input = parse::(input_json, "WorkerRemove")?; - let runtime_id = authority_id(&input.runtime_id, "runtime_id")?; - let worker_id = authority_id(&input.worker_id, "worker_id")?; + let (runtime_id, worker_id) = runtime_subject_ids(&input.subject, self.operation)?; let expected_worker_revision = non_empty(input.expected_worker_revision, "expected_worker_revision")?; let reason = non_empty(input.reason, "reason")?; @@ -417,153 +783,78 @@ impl Tool for WorkspaceWorkerTool { "reason must contain at most 512 bytes".to_string(), )); } - self.client - .execute_worker_remove( + self.control + .remove_runtime_worker( &runtime_id, &worker_id, &expected_worker_revision, &reason, ) - .map_err(|error| ToolError::ExecutionFailed(error.to_string()))? + .map_err(control_tool_error)? } - operation => { - let request = match operation { - WorkerOperation::List => { - parse::(input_json, "WorkerList")?; - WorkspaceRequest::get(format!( - "/api/w/{}/worker-control/workers", - self.workspace_id - )) - } - WorkerOperation::SendInput | WorkerOperation::Notify => { - let tool_name = operation.tool_name(); - let input = parse::(input_json, tool_name)?; - let runtime_id = authority_id(&input.runtime_id, "runtime_id")?; - let worker_id = authority_id(&input.worker_id, "worker_id")?; - let content = non_empty(input.content, "content")?; - if content.len() > 16 * 1024 { - return Err(ToolError::ExecutionFailed( - "content must contain at most 16384 bytes".to_string(), - )); - } - WorkspaceRequest::json( - WorkspaceRequestMethod::Post, - format!( - "/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/input", - self.workspace_id - ), - serde_json::json!({ - "kind": if operation == WorkerOperation::Notify { "notify" } else { "user" }, - "content": content, - }) - .to_string(), - ) - } - WorkerOperation::Cancel => { - let input = parse::(input_json, "WorkerCancel")?; - let runtime_id = authority_id(&input.runtime_id, "runtime_id")?; - let worker_id = authority_id(&input.worker_id, "worker_id")?; - let reason = input.reason.unwrap_or_default(); - WorkspaceRequest::json( - WorkspaceRequestMethod::Post, - format!( - "/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/cancel", - self.workspace_id - ), - serde_json::json!({ "reason": reason }).to_string(), - ) - } - WorkerOperation::Spawn => { - let input = parse::(input_json, "WorkerSpawn")?; - let ticket_id = input - .ticket_id - .map(|ticket_id| authority_id(&ticket_id, "ticket_id")) - .transpose()?; - let operation_id = ticket_id - .as_ref() - .map(|ticket_id| { - let call_id = non_empty(ctx.call_id.clone(), "tool call_id")?; - Ok::<_, ToolError>(format!("worker-spawn:{ticket_id}:{call_id}")) - }) - .transpose()?; - let lifecycle = WorkspaceWorkerLifecycleService { - client: self.client.clone(), - workspace_id: self.workspace_id.clone(), - }; - let response = lifecycle - .spawn(WorkerLifecycleSpawnRequest { - runtime_id: authority_id(&input.runtime_id, "runtime_id")?, - working_directory_id: authority_id( - &input.working_directory_id, - "working_directory_id", - )?, - relative_cwd: input - .relative_cwd - .map(|value| validate_relative_cwd(&value)) - .transpose()?, - profile: non_empty(input.profile, "profile")?, - ticket_id, - operation_id, - display_name: input - .display_name - .filter(|value| !value.trim().is_empty()) - .unwrap_or_else(|| "Workspace Worker".to_string()), - initial_submit: input.initial_submit, - }) - .await - .map_err(|error| ToolError::ExecutionFailed(error.to_string()))?; - return tool_output(self.operation, response); - } - WorkerOperation::Stop => { - let input = parse::(input_json, "WorkerStop")?; - let runtime_id = authority_id(&input.runtime_id, "runtime_id")?; - let worker_id = authority_id(&input.worker_id, "worker_id")?; - WorkspaceRequest::json( - WorkspaceRequestMethod::Post, - format!( - "/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/stop", - self.workspace_id - ), - serde_json::json!({ "reason": input.reason }).to_string(), - ) - } - WorkerOperation::Restore => { - let input = parse::(input_json, "WorkerRestore")?; - let runtime_id = authority_id(&input.runtime_id, "runtime_id")?; - let worker_id = authority_id(&input.worker_id, "worker_id")?; - WorkspaceRequest::json( - WorkspaceRequestMethod::Post, - format!( - "/api/w/{}/worker-control/workers/{runtime_id}/{worker_id}/restore", - self.workspace_id - ), - "{}", - ) - } - WorkerOperation::Remove => unreachable!("handled above"), + WorkerOperation::Share | WorkerOperation::Transfer => { + let input = parse::(input_json, self.operation.tool_name())?; + let grant_id = authority_id(&input.grant_id, "grant_id")?; + let (runtime_id, worker_id) = + runtime_subject_ids(&input.target_controller, self.operation)?; + let operation_id = format!( + "worker-control-{}:{}", + if self.operation == WorkerOperation::Transfer { + "transfer" + } else { + "share" + }, + non_empty(ctx.call_id.clone(), "tool call_id")? + ); + let action = if self.operation == WorkerOperation::Transfer { + "transfer" + } else { + "share" }; - self.client - .execute(request) - .map_err(|error| ToolError::ExecutionFailed(error.to_string()))? + self.control + .execute_runtime(WorkspaceRequest::json( + WorkspaceRequestMethod::Post, + format!( + "/api/w/{}/worker-control/grants/{grant_id}/{action}", + self.control.workspace_id() + ), + serde_json::json!({ + "target_controller": { + "runtime_id": runtime_id, + "worker_id": worker_id, + }, + "operation_id": operation_id, + }) + .to_string(), + )) + .await + .map_err(control_tool_error)? + } + WorkerOperation::Revoke => { + let input = parse::(input_json, "WorkerRevoke")?; + let grant_id = authority_id(&input.grant_id, "grant_id")?; + self.control + .execute_runtime(WorkspaceRequest::json( + WorkspaceRequestMethod::Post, + format!( + "/api/w/{}/worker-control/grants/{grant_id}/revoke", + self.control.workspace_id() + ), + "{}", + )) + .await + .map_err(control_tool_error)? } - }; - let response = if self.operation == WorkerOperation::List { - self.with_subworkers(response).await? - } else { - response }; tool_output(self.operation, response) } } impl WorkspaceWorkerTool { - async fn with_subworkers( + fn with_subworkers( &self, mut response: WorkspaceResponse, ) -> Result { - let Some(registry) = &self.registry else { - return Ok(response); - }; if !response.is_success() { return Ok(response); } @@ -579,19 +870,7 @@ impl WorkspaceWorkerTool { "WorkerList response did not contain an items array".to_string(), ) })?; - for internal in registry.list_internal() { - let child_name = internal.worker_name.clone(); - items.push(serde_json::json!({ - "subject": { "kind": "sub_worker", "name": child_name }, - "relation": "direct_child", - "origin": "sub_worker_spawn", - "permissions": ["send_input", "stop", "observe"], - "summary": { - "display_name": internal.worker_name, - "status": format!("{:?}", internal.session.status()).to_lowercase(), - } - })); - } + items.extend(self.control.known_subworkers()); response.body = serde_json::to_string(&body).map_err(|error| { ToolError::ExecutionFailed(format!("WorkerList could not encode its response: {error}")) })?; @@ -599,6 +878,43 @@ impl WorkspaceWorkerTool { } } +fn runtime_subject_ids( + subject: &WorkerSubjectInput, + operation: WorkerOperation, +) -> Result<(String, String), ToolError> { + match subject { + WorkerSubjectInput::RuntimeWorker { + runtime_id, + worker_id, + } => Ok(( + authority_id(runtime_id, "runtime_id")?, + authority_id(worker_id, "worker_id")?, + )), + WorkerSubjectInput::SubWorker { .. } => Err(unsupported_subject(operation, "sub_worker")), + } +} + +fn subworker_subject( + name: &str, +) -> Result { + Ok( + super::worker_observation::WorkerObservationSubjectRef::SubWorker { + name: authority_id(name, "name")?, + }, + ) +} + +fn unsupported_subject(operation: WorkerOperation, kind: &str) -> ToolError { + ToolError::InvalidArgument(format!( + "{} does not support subject kind '{kind}'", + operation.tool_name() + )) +} + +fn control_tool_error(error: WorkspaceClientError) -> ToolError { + ToolError::ExecutionFailed(error.to_string()) +} + fn tool_output( operation: WorkerOperation, response: WorkspaceResponse, @@ -618,9 +934,7 @@ fn tool_output( fn definition( operation: WorkerOperation, - client: Arc, - workspace_id: String, - registry: Option>, + control: Arc, ) -> ToolDefinition { Arc::new(move || { let schema = schemars::schema_for!(I); @@ -630,9 +944,7 @@ fn definition( .input_schema(schema_value); let tool: Arc = Arc::new(WorkspaceWorkerTool { operation, - client: client.clone(), - workspace_id: workspace_id.clone(), - registry: registry.clone(), + control: control.clone(), }); (meta, tool) }) @@ -733,14 +1045,20 @@ mod tests { } } + fn test_control(client: Arc) -> Arc { + Arc::new(WorkspaceWorkerControlService { + client, + workspace_id: "workspace%2Ftest".to_string(), + registry: None, + }) + } + #[tokio::test] async fn worker_spawn_forwards_typed_initial_submit_to_workspace_api() { let client = Arc::new(RecordingWorkspaceClient::default()); let tool = WorkspaceWorkerTool { operation: WorkerOperation::Spawn, - client: client.clone(), - workspace_id: "workspace%2Ftest".to_string(), - registry: None, + control: test_control(client.clone()), }; tool.execute( &serde_json::json!({ @@ -813,6 +1131,9 @@ mod tests { "WorkerStop", "WorkerRestore", "WorkerRemove", + "WorkerShare", + "WorkerTransfer", + "WorkerRevoke", ] ); } @@ -869,8 +1190,11 @@ mod tests { ( WorkerOperation::SendInput, serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "content": "continue", }), "/input", @@ -879,8 +1203,11 @@ mod tests { ( WorkerOperation::Notify, serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "content": "review ready", }), "/input", @@ -889,8 +1216,11 @@ mod tests { ( WorkerOperation::Cancel, serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "reason": "superseded", }), "/cancel", @@ -899,9 +1229,7 @@ mod tests { ] { WorkspaceWorkerTool { operation, - client: client.clone(), - workspace_id: "workspace%2Ftest".to_string(), - registry: None, + control: test_control(client.clone()), } .execute( &args.to_string(), @@ -920,19 +1248,59 @@ mod tests { } } + #[tokio::test] + async fn worker_share_and_transfer_use_typed_runtime_subjects_and_operation_ids() { + let client = Arc::new(RecordingWorkspaceClient::default()); + for (operation, action) in [ + (WorkerOperation::Share, "share"), + (WorkerOperation::Transfer, "transfer"), + ] { + WorkspaceWorkerTool { + operation, + control: test_control(client.clone()), + } + .execute( + &serde_json::json!({ + "grant_id": "grant-1", + "target_controller": { + "kind": "runtime_worker", + "runtime_id": "runtime-2", + "worker_id": "worker-9", + }, + }) + .to_string(), + ToolExecutionContext::new("call-delegate", "batch-delegate", 0), + ) + .await + .unwrap(); + let request = client.requests.lock().unwrap().last().cloned().unwrap(); + assert!(request.path.ends_with(&format!("/grant-1/{action}"))); + let body: serde_json::Value = + serde_json::from_str(request.body.as_deref().unwrap()).unwrap(); + assert_eq!(body["target_controller"]["runtime_id"], "runtime-2"); + assert!( + body["operation_id"] + .as_str() + .unwrap() + .contains("call-delegate") + ); + } + } + #[tokio::test] async fn worker_remove_forwards_only_target_revision_and_bounded_reason() { let client = Arc::new(RecordingWorkspaceClient::default()); let tool = WorkspaceWorkerTool { operation: WorkerOperation::Remove, - client: client.clone(), - workspace_id: "workspace%2Ftest".to_string(), - registry: None, + control: test_control(client.clone()), }; tool.execute( &serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "expected_worker_revision": "2026-08-11T20:00:00Z", "reason": " retire completed Worker " }) @@ -972,16 +1340,17 @@ mod tests { let client = Arc::new(RecordingWorkspaceClient::default()); let tool = WorkspaceWorkerTool { operation: WorkerOperation::Remove, - client: client.clone(), - workspace_id: "workspace%2Ftest".to_string(), - registry: None, + control: test_control(client.clone()), }; for reason in [" ".to_string(), "x".repeat(513)] { let _error = tool .execute( &serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "expected_worker_revision": "revision-1", "reason": reason, }) @@ -994,8 +1363,11 @@ mod tests { let _error = tool .execute( &serde_json::json!({ - "runtime_id": "runtime-1", - "worker_id": "worker-7", + "subject": { + "kind": "runtime_worker", + "runtime_id": "runtime-1", + "worker_id": "worker-7", + }, "expected_worker_revision": "revision-1", "reason": "retire", "source_proof": "caller-controlled" diff --git a/crates/worker/src/feature/builtin/worker_observation.rs b/crates/worker/src/feature/builtin/worker_observation.rs index cae10728..e9e65f22 100644 --- a/crates/worker/src/feature/builtin/worker_observation.rs +++ b/crates/worker/src/feature/builtin/worker_observation.rs @@ -7,7 +7,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use session_store::collect_state; -use super::manage_worker::WORKER_CONTROL_SERVICE_ID; +use super::manage_worker::{WORKER_CONTROL_SERVICE_ID, WorkerControlService}; use crate::feature::{ FeatureDescriptor, FeatureInstallContext, FeatureInstallError, FeatureInstructionContribution, FeatureInstructionDeclaration, FeatureInstructionId, FeatureModule, ServiceId, @@ -186,6 +186,43 @@ fn workspace_client_error(error: crate::worker::WorkspaceClientError) -> WorkerO } #[derive(Clone)] +struct ControlAuthorizedObservationProvider { + control: Arc, + inner: Arc, +} + +#[async_trait] +impl WorkerObservationProvider for ControlAuthorizedObservationProvider { + async fn list_worker_sessions( + &self, + ) -> Result, WorkerObservationError> { + let candidates = self.inner.list_worker_sessions().await?; + let mut granted = Vec::new(); + for candidate in candidates { + if self + .control + .ensure_permission(&candidate.subject, "observe") + .await + .is_ok() + { + granted.push(candidate); + } + } + Ok(granted) + } + + async fn capture_worker_session( + &self, + subject: &WorkerObservationSubjectRef, + ) -> Result { + self.control + .ensure_permission(subject, "observe") + .await + .map_err(|_| WorkerObservationError::NotFound)?; + self.inner.capture_worker_session(subject).await + } +} + pub struct WorkerObservationFeature { provider: Arc, } @@ -227,17 +264,25 @@ impl FeatureModule for WorkerObservationFeature { .register(FeatureInstructionContribution::new( observation_instruction(), ))?; + let control = context + .services() + .require::(&ServiceId::builtin(WORKER_CONTROL_SERVICE_ID))?; + let provider: Arc = + Arc::new(ControlAuthorizedObservationProvider { + control, + inner: self.provider.clone(), + }); context.tools().register(ToolContribution::new( "ViewSessionOverview", - overview_definition(self.provider.clone()), + overview_definition(provider.clone()), ))?; context.tools().register(ToolContribution::new( "SearchSessionEntries", - search_definition(self.provider.clone()), + search_definition(provider.clone()), ))?; context.tools().register(ToolContribution::new( "ReadSessionEntry", - read_definition(self.provider.clone()), + read_definition(provider), ))?; Ok(()) } diff --git a/crates/worker/src/spawn/comm_tools.rs b/crates/worker/src/spawn/comm_tools.rs index 458719b7..763ae531 100644 --- a/crates/worker/src/spawn/comm_tools.rs +++ b/crates/worker/src/spawn/comm_tools.rs @@ -1,6 +1,9 @@ +#![cfg_attr(not(test), allow(dead_code, unused_imports))] + //! Parent-facing tools for in-process Internal SubWorker sessions. //! -//! All four tools share the same parent-owned `SpawnedWorkerRegistry` of typed session handles. +//! Legacy direct-child tool constructors are test-only; production exposes the +//! registry through the unified `worker.control` service and Worker tools. //! There is no Runtime catalog lookup or child socket transport, so a Worker can operate only on //! its direct Internal children. The socket helper at the bottom remains solely for the legacy //! top-level Worker callback protocol and is not part of SubWorker communication. @@ -74,6 +77,7 @@ impl Tool for SubWorkerListTool { } } +#[cfg(test)] pub fn sub_worker_list_tool(registry: Arc) -> ToolDefinition { Arc::new(move || { let schema = schemars::schema_for!(SubWorkerListInput); @@ -132,6 +136,7 @@ impl Tool for SubWorkerSendTool { } } +#[cfg(test)] pub fn sub_worker_send_tool(registry: Arc) -> ToolDefinition { Arc::new(move || { let schema = schemars::schema_for!(SubWorkerSendInput); @@ -186,6 +191,7 @@ impl Tool for SubWorkerStopTool { } } +#[cfg(test)] pub fn sub_worker_stop_tool(registry: Arc) -> ToolDefinition { Arc::new(move || { let schema = schemars::schema_for!(NameInput); diff --git a/crates/workspace-server/src/hosts.rs b/crates/workspace-server/src/hosts.rs index 847812d1..65cb9e26 100644 --- a/crates/workspace-server/src/hosts.rs +++ b/crates/workspace-server/src/hosts.rs @@ -342,6 +342,12 @@ pub struct WorkerTicketAssignmentRequest { pub(crate) fn worker_spawn_idempotency( request: &WorkerSpawnRequest, ) -> Result, String> { + if let Some(operation) = request.resolved_control_operation.as_ref() { + return Ok(Some(( + operation.operation_id.clone(), + operation.input_fingerprint.clone(), + ))); + } let Some(assignment) = request.ticket_assignment.as_ref() else { return Ok(None); }; @@ -353,6 +359,12 @@ pub(crate) fn worker_spawn_idempotency( ))) } +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct WorkerControlOperation { + pub operation_id: String, + pub input_fingerprint: String, +} + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(deny_unknown_fields)] pub struct WorkerSpawnRequest { @@ -384,6 +396,9 @@ pub struct WorkerSpawnRequest { /// Backend-authored peer-session grants. Browser/model input cannot set this field. #[serde(skip, default)] pub resolved_worker_observation_grants: Vec, + /// Trusted Backend operation identity used to make Worker-owned spawns replay-safe. + #[serde(skip, default)] + pub resolved_control_operation: Option, } #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] @@ -4801,10 +4816,28 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: Some(test_workspace_api()), } } + #[test] + fn trusted_control_operation_is_runtime_spawn_idempotency_authority() { + let mut request = embedded_spawn_request(); + request.resolved_control_operation = Some(WorkerControlOperation { + operation_id: "control-op-1".to_string(), + input_fingerprint: "sha256:control-input".to_string(), + }); + + assert_eq!( + worker_spawn_idempotency(&request).unwrap(), + Some(( + "control-op-1".to_string(), + "sha256:control-input".to_string(), + )) + ); + } + #[test] fn spawn_config_bundle_ref_preserves_bundle_identity() { let mut request = embedded_spawn_request(); @@ -5016,6 +5049,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: Some(test_workspace_api()), }, ) @@ -5113,6 +5147,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: Some(test_workspace_api()), }, ) @@ -5149,6 +5184,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: Some(test_workspace_api()), }, ) diff --git a/crates/workspace-server/src/server.rs b/crates/workspace-server/src/server.rs index b77e82b4..5e856c87 100644 --- a/crates/workspace-server/src/server.rs +++ b/crates/workspace-server/src/server.rs @@ -75,10 +75,10 @@ use crate::hosts::{ EmbeddedWorkerRuntime, HostSummary, RemoteRuntimeConfig, RemoteWorkerRuntime, RuntimeDiagnostic, RuntimeRegistry, RuntimeRegistryError, RuntimeRegistryUnregisterResult, RuntimeSummary, TicketWorkerRole, WorkerCapabilitySummary, WorkerCompletionsRequest, - WorkerCompletionsResult, WorkerImplementationSummary, WorkerInputKind, WorkerInputRequest, - WorkerInputResult, WorkerLifecycleRequest, WorkerLifecycleResult, WorkerOperationState, - WorkerRestoreResult, WorkerSpawnAcceptanceRequirement, WorkerSpawnIntent, WorkerSpawnRequest, - WorkerSpawnResult, WorkerSpawnWorkingDirectoryRequest, WorkerSummary, + WorkerCompletionsResult, WorkerControlOperation, WorkerImplementationSummary, WorkerInputKind, + WorkerInputRequest, WorkerInputResult, WorkerLifecycleRequest, WorkerLifecycleResult, + WorkerOperationState, WorkerRestoreResult, WorkerSpawnAcceptanceRequirement, WorkerSpawnIntent, + WorkerSpawnRequest, WorkerSpawnResult, WorkerSpawnWorkingDirectoryRequest, WorkerSummary, WorkerTicketAssignmentRequest, WorkerWorkspaceSummary, }; use crate::identity::WorkspaceIdentity; @@ -264,6 +264,7 @@ pub struct WorkspaceApi { workdir_sessions: Arc>>, workdir_session_locks: Arc>>>>, worker_remove_locks: Arc>>>>, + worker_control_locks: Arc>>>>, } #[derive(Clone)] @@ -274,6 +275,7 @@ struct WorkspaceWorkerRemoveExecutor { workdir_sessions: Arc>>, workdir_session_locks: Arc>>>>, worker_remove_locks: Arc>>>>, + worker_control_locks: Arc>>>>, } impl WorkspaceWorkerRemoveExecutor { @@ -285,6 +287,7 @@ impl WorkspaceWorkerRemoveExecutor { workdir_sessions: api.workdir_sessions.clone(), workdir_session_locks: api.workdir_session_locks.clone(), worker_remove_locks: api.worker_remove_locks.clone(), + worker_control_locks: api.worker_control_locks.clone(), } } @@ -347,17 +350,46 @@ impl WorkspaceWorkerRemoveExecutor { )); } let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); - let granted = self + let grant = self .store .get_active_worker_control_grant(&self.workspace_id, &controller, &target) .map_err(|_| "Worker control grant authority is unavailable".to_string())? - .is_some_and(|grant| { + .filter(|grant| { grant .permissions .iter() .any(|permission| permission == "remove") }); - if !granted { + let Some(grant) = grant else { + return Ok(worker_remove_error_response( + StatusCode::NOT_FOUND, + "unknown_worker", + "The target Worker is not known to the current Worker", + )); + }; + let control_lock = { + let mut locks = self + .worker_control_locks + .lock() + .map_err(|_| "Worker control lock registry was poisoned".to_string())?; + locks + .entry(grant.grant_id.clone()) + .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(()))) + .clone() + }; + let _control_guard = control_lock.lock().await; + let still_granted = self + .store + .get_active_worker_control_grant(&self.workspace_id, &controller, &target) + .map_err(|_| "Worker control grant authority is unavailable".to_string())? + .is_some_and(|current| { + current.grant_id == grant.grant_id + && current + .permissions + .iter() + .any(|permission| permission == "remove") + }); + if !still_granted { return Ok(worker_remove_error_response( StatusCode::NOT_FOUND, "unknown_worker", @@ -787,6 +819,7 @@ impl WorkspaceApi { workdir_sessions: Arc::new(Mutex::new(HashMap::new())), workdir_session_locks: Arc::new(Mutex::new(HashMap::new())), worker_remove_locks: Arc::new(Mutex::new(HashMap::new())), + worker_control_locks: Arc::new(Mutex::new(HashMap::new())), }; if let Some(dispatcher) = worker_remove_dispatcher { dispatcher @@ -1443,6 +1476,18 @@ pub fn build_router(api: WorkspaceApi) -> Router { "/api/w/{workspace_id}/worker-control/workers", get(list_known_workers).post(spawn_known_worker), ) + .route( + "/api/w/{workspace_id}/worker-control/grants/{grant_id}/share", + post(share_worker_control_grant), + ) + .route( + "/api/w/{workspace_id}/worker-control/grants/{grant_id}/transfer", + post(transfer_worker_control_grant), + ) + .route( + "/api/w/{workspace_id}/worker-control/grants/{grant_id}/revoke", + post(revoke_worker_control_grant), + ) .route( "/api/w/{workspace_id}/worker-control/workers/{runtime_id}/{worker_id}/input", post(send_known_worker_input), @@ -2052,7 +2097,7 @@ pub struct BrowserWorkingDirectoryCreateRequest { pub selector: Option, } -#[derive(Debug, Deserialize)] +#[derive(Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct BrowserWorkerWorkingDirectorySelection { pub working_directory_id: String, @@ -2070,14 +2115,14 @@ pub struct BrowserWorkspaceOrchestratorResponse { pub diagnostics: Vec, } -#[derive(Debug, Deserialize)] +#[derive(Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct CreateWorkspaceWorkerTicketAssignmentRequest { pub ticket_id: String, pub operation_id: String, } -#[derive(Debug, Deserialize)] +#[derive(Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct CreateWorkspaceWorkerRequest { pub runtime_id: String, @@ -2093,6 +2138,9 @@ pub struct CreateWorkspaceWorkerRequest { /// Backend idempotency key used only for authenticated Worker-owned spawn/control. #[serde(default)] pub control_operation_id: Option, + /// Trusted resolution populated only by the authenticated worker-control handler. + #[serde(skip, default)] + pub resolved_control_operation: Option, } #[derive(Debug, Serialize, Deserialize)] @@ -2209,6 +2257,12 @@ struct ScopedWorkspacePath { workspace_id: String, } +#[derive(Debug, Deserialize)] +struct ScopedWorkerControlGrantPath { + workspace_id: String, + grant_id: String, +} + #[derive(Debug, Deserialize)] struct ScopedFlowPath { workspace_id: String, @@ -5274,6 +5328,7 @@ fn start_memory_staging_consolidation( resolved_config_bundle, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }, )?; @@ -5861,6 +5916,7 @@ async fn scoped_workspace_orchestrator_status( #[derive(Debug, Serialize, Deserialize)] struct KnownWorkerRecord { + grant_id: String, subject: RuntimeWorkerRef, relation: String, origin: String, @@ -5895,6 +5951,7 @@ async fn list_known_workers( .worker(&grant.subject) .map_err(|error| error.into_error())?; items.push(KnownWorkerRecord { + grant_id: grant.grant_id, subject: grant.subject, relation: grant.relation, origin: grant.origin, @@ -5913,7 +5970,7 @@ async fn spawn_known_worker( State(api): State, AxumPath(path): AxumPath, headers: HeaderMap, - Json(request): Json, + Json(mut request): Json, ) -> ApiResult> { validate_workspace_scope(&api, &path.workspace_id)?; let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; @@ -5929,31 +5986,20 @@ async fn spawn_known_worker( .filter(|value| !value.is_empty()) .ok_or_else(|| Error::InvalidInput("control_operation_id is required".to_string()))? .to_string(); + let fingerprint_input = serde_json::to_vec(&request) + .map_err(|error| Error::InvalidInput(format!("invalid Worker spawn input: {error}")))?; + let input_fingerprint = format!( + "sha256:{}", + Sha256::digest(&fingerprint_input) + .iter() + .map(|byte| format!("{byte:02x}")) + .collect::() + ); + request.resolved_control_operation = Some(WorkerControlOperation { + operation_id: operation_id.clone(), + input_fingerprint, + }); let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); - if request.ticket_assignment.is_none() - && let Some(existing) = api.store.get_worker_control_grant_by_operation( - &path.workspace_id, - &controller, - &operation_id, - )? - { - let worker = api - .runtime - .worker(&existing.subject) - .map_err(|error| error.into_error())?; - return Ok(Json(BrowserCreateWorkerResponse { - workspace_id: path.workspace_id, - console_href: format!( - "/w/{}/runtimes/{}/workers/{}/console", - encode_path_segment(&existing.workspace_id), - encode_path_segment(&existing.subject.runtime_id), - encode_path_segment(&existing.subject.worker_id), - ), - worker_ref: existing.subject, - worker, - diagnostics: Vec::new(), - })); - } let response = create_workspace_worker(State(api.clone()), headers, Json(request)).await?; if let Err(error) = api .store @@ -5971,6 +6017,8 @@ async fn spawn_known_worker( "stop".to_string(), "restore".to_string(), "remove".to_string(), + "share".to_string(), + "transfer".to_string(), "observe".to_string(), ], operation_id, @@ -5978,23 +6026,34 @@ async fn spawn_known_worker( revoked_at: None, }) { - let subject = response.0.worker_ref.clone(); - let _ = api.runtime.delete_worker(&subject); - let _ = api - .store - .delete_worker_registry(&path.workspace_id, &subject); + // Runtime creation is idempotent under the trusted control operation. + // Preserve the unacknowledged Worker/assignment so a retry converges on + // the same subject and can finish grant persistence without creating a + // second Worker or leaving assignment cleanup races. return Err(ApiError::from(error)); } Ok(response) } +fn worker_control_lock(api: &WorkspaceApi, grant_id: &str) -> Arc> { + let mut locks = api + .worker_control_locks + .lock() + .unwrap_or_else(|poisoned| poisoned.into_inner()); + Arc::clone( + locks + .entry(grant_id.to_string()) + .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(()))), + ) +} + fn authorize_known_worker_permission( api: &WorkspaceApi, workspace_id: &str, controller: &RuntimeWorkerRef, subject: &RuntimeWorkerRef, permission: &str, -) -> Result<()> { +) -> Result { let grant = api .store .get_active_worker_control_grant(workspace_id, controller, subject)? @@ -6010,7 +6069,184 @@ fn authorize_known_worker_permission( "worker control permission `{permission}` was not granted" ))); } - Ok(()) + Ok(grant) +} + +#[derive(Debug, Deserialize)] +#[serde(deny_unknown_fields)] +struct DelegateWorkerControlGrantRequest { + target_controller: RuntimeWorkerRef, + operation_id: String, +} + +async fn share_worker_control_grant( + State(api): State, + AxumPath(path): AxumPath, + headers: HeaderMap, + Json(request): Json, +) -> ApiResult> { + delegate_worker_control_grant(api, path, headers, request, false).await +} + +async fn transfer_worker_control_grant( + State(api): State, + AxumPath(path): AxumPath, + headers: HeaderMap, + Json(request): Json, +) -> ApiResult> { + delegate_worker_control_grant(api, path, headers, request, true).await +} + +async fn delegate_worker_control_grant( + api: WorkspaceApi, + path: ScopedWorkerControlGrantPath, + headers: HeaderMap, + request: DelegateWorkerControlGrantRequest, + transfer: bool, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; + let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let permission = if transfer { "transfer" } else { "share" }; + let grant = api + .store + .get_worker_control_grant(&path.workspace_id, &path.grant_id)? + .filter(|grant| { + grant.controller == controller + && grant.permissions.iter().any(|value| value == permission) + }) + .ok_or_else(|| Error::UnknownWorker { + worker: controller.clone(), + })?; + if request.target_controller == controller { + return Err(ApiError::from(Error::InvalidInput( + "target_controller must differ from the current Worker".to_string(), + ))); + } + api.store + .get_worker_registry(&path.workspace_id, &request.target_controller)? + .ok_or_else(|| Error::UnknownWorker { + worker: request.target_controller.clone(), + })?; + let operation_id = request.operation_id.trim(); + if operation_id.is_empty() || operation_id.len() > 200 { + return Err(ApiError::from(Error::InvalidInput( + "operation_id must contain 1..=200 bytes".to_string(), + ))); + } + let expected_origin = format!("worker_control_{permission}:{}", grant.grant_id); + if let Some(existing) = api.store.get_worker_control_grant_by_operation( + &path.workspace_id, + &request.target_controller, + operation_id, + )? { + if existing.subject == grant.subject && existing.origin == expected_origin { + if transfer && grant.revoked_at.is_none() { + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; + let now = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true); + if api + .store + .get_worker_control_grant(&path.workspace_id, &grant.grant_id)? + .is_some_and(|current| current.revoked_at.is_none()) + { + api.store.revoke_worker_control_grant( + &path.workspace_id, + &grant.grant_id, + &now, + )?; + } + } + return Ok(Json(existing)); + } + return Err(ApiError::from(Error::InvalidInput( + "operation_id was already used with different grant input".to_string(), + ))); + } + if grant.revoked_at.is_some() { + return Err(ApiError::from(Error::UnknownWorker { + worker: grant.subject, + })); + } + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; + let current = api + .store + .get_worker_control_grant(&path.workspace_id, &path.grant_id)? + .filter(|candidate| { + candidate.controller == controller + && candidate.revoked_at.is_none() + && candidate + .permissions + .iter() + .any(|value| value == permission) + }) + .ok_or_else(|| Error::UnknownWorker { + worker: grant.subject.clone(), + })?; + let now = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true); + let delegated = api + .store + .create_worker_control_grant(&WorkerControlGrantRecord { + workspace_id: path.workspace_id.clone(), + grant_id: new_id("wcg"), + controller: request.target_controller, + subject: current.subject.clone(), + relation: if transfer { "transferred" } else { "shared" }.to_string(), + origin: expected_origin, + permissions: current.permissions.clone(), + operation_id: operation_id.to_string(), + created_at: now.clone(), + revoked_at: None, + })?; + if transfer + && !api + .store + .revoke_worker_control_grant(&path.workspace_id, ¤t.grant_id, &now)? + { + return Err(ApiError::from(Error::UnknownWorker { + worker: current.subject, + })); + } + Ok(Json(delegated)) +} + +async fn revoke_worker_control_grant( + State(api): State, + AxumPath(path): AxumPath, + headers: HeaderMap, +) -> ApiResult> { + validate_workspace_scope(&api, &path.workspace_id)?; + let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; + let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let grant = api + .store + .get_worker_control_grant(&path.workspace_id, &path.grant_id)? + .filter(|grant| grant.controller == controller && grant.revoked_at.is_none()) + .ok_or_else(|| Error::UnknownWorker { + worker: controller.clone(), + })?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; + let current = api + .store + .get_worker_control_grant(&path.workspace_id, &path.grant_id)? + .filter(|candidate| candidate.controller == controller && candidate.revoked_at.is_none()) + .ok_or_else(|| Error::UnknownWorker { + worker: grant.subject.clone(), + })?; + let revoked_at = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true); + if !api + .store + .revoke_worker_control_grant(&path.workspace_id, &path.grant_id, &revoked_at)? + { + return Err(ApiError::from(Error::UnknownWorker { + worker: current.subject, + })); + } + let mut revoked = current; + revoked.revoked_at = Some(revoked_at); + Ok(Json(revoked)) } async fn send_known_worker_input( @@ -6026,6 +6262,15 @@ async fn send_known_worker_input( WorkerInputKind::Notify => "notify", _ => "send_input", }; + let grant = authorize_known_worker_permission( + &api, + &path.workspace_id, + &controller, + &path.worker, + permission, + )?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; authorize_known_worker_permission( &api, &path.workspace_id, @@ -6045,6 +6290,15 @@ async fn cancel_known_worker( validate_workspace_scope(&api, &path.workspace_id)?; let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let grant = authorize_known_worker_permission( + &api, + &path.workspace_id, + &controller, + &path.worker, + "cancel", + )?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; authorize_known_worker_permission( &api, &path.workspace_id, @@ -6065,6 +6319,10 @@ async fn stop_known_worker( let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; let subject = path.worker.clone(); let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let grant = + authorize_known_worker_permission(&api, &path.workspace_id, &controller, &subject, "stop")?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; authorize_known_worker_permission(&api, &path.workspace_id, &controller, &subject, "stop")?; scoped_stop_runtime_worker(State(api), AxumPath(path), Json(request)).await } @@ -6078,6 +6336,15 @@ async fn restore_known_worker( let source = authenticate_worker_mutation_source(&api, &path.workspace_id, &headers)?; let subject = path.worker.clone(); let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let grant = authorize_known_worker_permission( + &api, + &path.workspace_id, + &controller, + &subject, + "restore", + )?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; authorize_known_worker_permission(&api, &path.workspace_id, &controller, &subject, "restore")?; scoped_restore_runtime_worker(State(api), AxumPath(path), Query(Default::default())).await } @@ -6141,6 +6408,15 @@ async fn scoped_capture_worker_observation_session( }; let target = RuntimeWorkerRef::new(runtime_id, worker_id); let controller = RuntimeWorkerRef::new(&source.runtime_id, &source.worker_id); + let grant = authorize_known_worker_permission( + &api, + &path.workspace_id, + &controller, + &target, + "observe", + )?; + let lock = worker_control_lock(&api, &grant.grant_id); + let _guard = lock.lock().await; authorize_known_worker_permission(&api, &path.workspace_id, &controller, &target, "observe")?; let target_summary = api .runtime @@ -6242,16 +6518,8 @@ async fn scoped_start_workspace_orchestrator( resolved_working_directory: None, resolved_config_bundle: None, resolved_worker_observation_enabled: true, - resolved_worker_observation_grants: workers_response(api.clone()) - .map(|response| { - response - .items - .into_iter() - .take(100) - .map(|worker| worker.worker) - .collect() - }) - .unwrap_or_default(), + resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }, )?; @@ -8692,6 +8960,7 @@ async fn create_workspace_worker( initial_submit, working_directory, control_operation_id: _, + resolved_control_operation, } = request; let config_state = api .config_store @@ -8771,6 +9040,7 @@ async fn create_workspace_worker( resolved_config_bundle, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation, resolved_workspace_api: None, }; validate_ticket_assignment_spawn(&api, &runtime_id, &request)?; @@ -12322,6 +12592,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; assert!( @@ -12351,6 +12622,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; assert!( @@ -12474,6 +12746,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; @@ -12520,6 +12793,7 @@ mod tests { }], working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -12560,6 +12834,7 @@ mod tests { initial_submit: Vec::new(), working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -12595,6 +12870,7 @@ mod tests { initial_submit: Vec::new(), working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -12697,6 +12973,7 @@ mod tests { }], working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -12978,6 +13255,104 @@ mod tests { assert!(retried.online); } + #[tokio::test] + async fn worker_control_spawn_retry_converges_on_one_worker_and_one_grant() { + let workspace = tempfile::tempdir().unwrap(); + init_clean_git_workspace(workspace.path()); + let api = test_api(workspace.path()).await; + let workspace_id = api.config.workspace_id.clone(); + let Json(controller_worker) = create_workspace_worker( + State(api.clone()), + HeaderMap::new(), + Json(CreateWorkspaceWorkerRequest { + runtime_id: EMBEDDED_WORKER_RUNTIME_ID.to_string(), + display_name: "Control caller".to_string(), + profile: None, + ticket_assignment: None, + initial_submit: Vec::new(), + working_directory: None, + control_operation_id: None, + resolved_control_operation: None, + }), + ) + .await + .unwrap(); + let controller = controller_worker.worker_ref; + let mut headers = HeaderMap::new(); + headers.insert( + "x-yoi-runtime-id", + axum::http::HeaderValue::from_str(&controller.runtime_id).unwrap(), + ); + headers.insert( + "x-yoi-worker-id", + axum::http::HeaderValue::from_str(&controller.worker_id).unwrap(), + ); + let request = || CreateWorkspaceWorkerRequest { + runtime_id: EMBEDDED_WORKER_RUNTIME_ID.to_string(), + display_name: "Idempotent controlled child".to_string(), + profile: None, + ticket_assignment: None, + initial_submit: Vec::new(), + working_directory: None, + control_operation_id: Some("control-spawn-retry".to_string()), + resolved_control_operation: None, + }; + + let Json(first) = spawn_known_worker( + State(api.clone()), + AxumPath(ScopedWorkspacePath { + workspace_id: workspace_id.clone(), + }), + headers.clone(), + Json(request()), + ) + .await + .unwrap(); + let Json(retried) = spawn_known_worker( + State(api.clone()), + AxumPath(ScopedWorkspacePath { + workspace_id: workspace_id.clone(), + }), + headers, + Json(request()), + ) + .await + .unwrap(); + + assert_eq!(retried.worker_ref, first.worker_ref); + let mut conflicting_request = request(); + conflicting_request.display_name = "Different controlled child".to_string(); + let conflict = spawn_known_worker( + State(api.clone()), + AxumPath(ScopedWorkspacePath { + workspace_id: workspace_id.clone(), + }), + { + let mut headers = HeaderMap::new(); + headers.insert( + "x-yoi-runtime-id", + axum::http::HeaderValue::from_str(&controller.runtime_id).unwrap(), + ); + headers.insert( + "x-yoi-worker-id", + axum::http::HeaderValue::from_str(&controller.worker_id).unwrap(), + ); + headers + }, + Json(conflicting_request), + ) + .await + .unwrap_err(); + assert_eq!(conflict.into_response().status(), StatusCode::BAD_GATEWAY); + let grants = api + .store + .list_active_worker_control_grants(&workspace_id, &controller, 10) + .unwrap(); + assert_eq!(grants.len(), 1); + assert_eq!(grants[0].subject, first.worker_ref); + assert_eq!(grants[0].operation_id, "control-spawn-retry"); + } + #[tokio::test] async fn explicit_orchestrator_launch_marks_only_the_dedicated_worker() { let workspace = tempfile::tempdir().unwrap(); @@ -12996,6 +13371,7 @@ mod tests { initial_submit: Vec::new(), working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -13013,6 +13389,7 @@ mod tests { initial_submit: Vec::new(), working_directory: None, control_operation_id: None, + resolved_control_operation: None, }), ) .await @@ -13069,6 +13446,7 @@ mod tests { .await .unwrap(); assert_eq!(known.items.len(), 1); + assert_eq!(known.items[0].grant_id, "orchestrator-controls-generic"); assert_eq!(known.items[0].subject, generic.worker_ref); assert_eq!(known.items[0].permissions, ["observe"]); @@ -13097,7 +13475,7 @@ mod tests { AxumPath(ScopedWorkspacePath { workspace_id: workspace_id.clone(), }), - observation_headers, + observation_headers.clone(), Json(WorkerObservationSubjectRef::RuntimeWorker { runtime_id: generic.worker_ref.runtime_id.clone(), worker_id: generic.worker_ref.worker_id.clone(), @@ -13107,6 +13485,35 @@ mod tests { .unwrap(); assert!(capture["entries"].is_array()); + let Json(revoked) = revoke_worker_control_grant( + State(api.clone()), + AxumPath(ScopedWorkerControlGrantPath { + workspace_id: workspace_id.clone(), + grant_id: "orchestrator-controls-generic".to_string(), + }), + observation_headers.clone(), + ) + .await + .unwrap(); + assert!(revoked.revoked_at.is_some()); + let revoked_capture = scoped_capture_worker_observation_session( + State(api.clone()), + AxumPath(ScopedWorkspacePath { + workspace_id: workspace_id.clone(), + }), + observation_headers.clone(), + Json(WorkerObservationSubjectRef::RuntimeWorker { + runtime_id: generic.worker_ref.runtime_id.clone(), + worker_id: generic.worker_ref.worker_id.clone(), + }), + ) + .await + .unwrap_err(); + assert_eq!( + revoked_capture.into_response().status(), + StatusCode::NOT_FOUND + ); + let mut unauthorized_headers = HeaderMap::new(); unauthorized_headers.insert( "x-yoi-runtime-id", @@ -13127,6 +13534,80 @@ mod tests { .unwrap(); assert!(unauthorized["sessions"].as_array().unwrap().is_empty()); + for (grant_id, permission) in [ + ("orchestrator-share-source", "share"), + ("orchestrator-transfer-source", "transfer"), + ] { + api.store + .create_worker_control_grant(&WorkerControlGrantRecord { + workspace_id: workspace_id.clone(), + grant_id: grant_id.to_string(), + controller: dedicated.worker.clone(), + subject: generic.worker_ref.clone(), + relation: "spawned".to_string(), + origin: "test-delegation".to_string(), + permissions: vec!["observe".to_string(), permission.to_string()], + operation_id: format!("seed-{permission}"), + created_at: "2026-07-27T00:00:01Z".to_string(), + revoked_at: None, + }) + .unwrap(); + } + let target_controller = generic.worker_ref.clone(); + let Json(shared) = share_worker_control_grant( + State(api.clone()), + AxumPath(ScopedWorkerControlGrantPath { + workspace_id: workspace_id.clone(), + grant_id: "orchestrator-share-source".to_string(), + }), + observation_headers.clone(), + Json(DelegateWorkerControlGrantRequest { + target_controller: target_controller.clone(), + operation_id: "share-operation".to_string(), + }), + ) + .await + .unwrap(); + assert_eq!(shared.controller, target_controller); + assert_eq!(shared.relation, "shared"); + let Json(transferred) = transfer_worker_control_grant( + State(api.clone()), + AxumPath(ScopedWorkerControlGrantPath { + workspace_id: workspace_id.clone(), + grant_id: "orchestrator-transfer-source".to_string(), + }), + observation_headers.clone(), + Json(DelegateWorkerControlGrantRequest { + target_controller: generic.worker_ref.clone(), + operation_id: "transfer-operation".to_string(), + }), + ) + .await + .unwrap(); + let Json(transfer_replay) = transfer_worker_control_grant( + State(api.clone()), + AxumPath(ScopedWorkerControlGrantPath { + workspace_id: workspace_id.clone(), + grant_id: "orchestrator-transfer-source".to_string(), + }), + observation_headers, + Json(DelegateWorkerControlGrantRequest { + target_controller: generic.worker_ref.clone(), + operation_id: "transfer-operation".to_string(), + }), + ) + .await + .unwrap(); + assert_eq!(transfer_replay.grant_id, transferred.grant_id); + assert!( + api.store + .get_worker_control_grant(&workspace_id, "orchestrator-transfer-source") + .unwrap() + .unwrap() + .revoked_at + .is_some() + ); + let Json(existing) = scoped_start_workspace_orchestrator( State(api.clone()), AxumPath(ScopedWorkspacePath { @@ -13656,6 +14137,7 @@ mod tests { resolved_workspace_api: Some(test_worker_workspace_api( EMBEDDED_WORKER_RUNTIME_ID, )), + resolved_control_operation: None, }, ) .unwrap(); @@ -13804,6 +14286,7 @@ mod tests { resolved_workspace_api: Some(test_worker_workspace_api( EMBEDDED_WORKER_RUNTIME_ID, )), + resolved_control_operation: None, }, ) .unwrap() @@ -14003,6 +14486,7 @@ mod tests { resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), resolved_workspace_api: Some(test_worker_workspace_api(EMBEDDED_WORKER_RUNTIME_ID)), + resolved_control_operation: None, }; let source_worker = api .runtime @@ -14221,6 +14705,7 @@ mod tests { resolved_workspace_api: Some(test_worker_workspace_api( EMBEDDED_WORKER_RUNTIME_ID, )), + resolved_control_operation: None, }, ) .unwrap() @@ -14362,6 +14847,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; let Json(first) = scoped_create_runtime_worker( @@ -14508,6 +14994,7 @@ mod tests { ticket_id: second_ticket.id.clone(), operation_id: "pending-spawn-operation".to_string(), }), + resolved_control_operation: None, ..request }; pending_request.resolved_workspace_api = @@ -14602,6 +15089,7 @@ mod tests { resolved_config_bundle: None, resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; let Json(created) = scoped_create_runtime_worker( @@ -15159,6 +15647,7 @@ mod tests { resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), resolved_workspace_api: None, + resolved_control_operation: None, }, ) .unwrap(); @@ -15239,6 +15728,7 @@ mod tests { resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), resolved_workspace_api: None, + resolved_control_operation: None, }, ) .unwrap(); @@ -17276,6 +17766,7 @@ mod tests { resolved_workspace_api: Some(test_worker_workspace_api( "embedded-worker-runtime", )), + resolved_control_operation: None, }, ) .expect("spawn worker"); @@ -17792,6 +18283,7 @@ mod tests { resolved_config_bundle: Some(runtime_test_bundle()), resolved_worker_observation_enabled: false, resolved_worker_observation_grants: Vec::new(), + resolved_control_operation: None, resolved_workspace_api: None, }; let spawned = api diff --git a/crates/workspace-server/src/store.rs b/crates/workspace-server/src/store.rs index ed298ead..f9dd91cd 100644 --- a/crates/workspace-server/src/store.rs +++ b/crates/workspace-server/src/store.rs @@ -758,6 +758,11 @@ pub trait ControlPlaneStore: Send + Sync { &self, record: &WorkerControlGrantRecord, ) -> Result; + fn get_worker_control_grant( + &self, + workspace_id: &str, + grant_id: &str, + ) -> Result>; fn get_worker_control_grant_by_operation( &self, workspace_id: &str, @@ -2429,6 +2434,27 @@ impl ControlPlaneStore for SqliteWorkspaceStore { }) } + fn get_worker_control_grant( + &self, + workspace_id: &str, + grant_id: &str, + ) -> Result> { + self.with_conn(|conn| { + conn.query_row( + r#"SELECT workspace_id, grant_id, + controller_runtime_id, controller_worker_id, + subject_runtime_id, subject_worker_id, + relation, origin, permissions_json, operation_id, created_at, revoked_at + FROM worker_control_grants + WHERE workspace_id = ?1 AND grant_id = ?2"#, + params![workspace_id, grant_id], + read_worker_control_grant_record, + ) + .optional() + .map_err(Error::from) + }) + } + fn get_worker_control_grant_by_operation( &self, workspace_id: &str, @@ -6978,7 +7004,9 @@ CREATE TABLE ticket_assignment_operations ( #[tokio::test] async fn worker_control_grants_are_idempotent_scoped_and_revocable() { - let store = SqliteWorkspaceStore::in_memory().unwrap(); + let dir = tempfile::tempdir().unwrap(); + let database = dir.path().join("control-grants.db"); + let store = SqliteWorkspaceStore::open(&database).unwrap(); store .upsert_workspace(&WorkspaceRecord { workspace_id: "workspace-control".to_string(), @@ -7047,6 +7075,20 @@ CREATE TABLE ticket_assignment_operations ( Some(grant.clone()) ); + drop(store); + let store = SqliteWorkspaceStore::open(&database).unwrap(); + assert_eq!( + store + .list_active_worker_control_grants( + "workspace-control", + &controller_record.worker, + 10, + ) + .unwrap(), + vec![grant.clone()], + "known Runtime Worker grants survive Backend restart" + ); + let conflicting_replay = WorkerControlGrantRecord { subject: controller_record.worker.clone(), ..grant.clone() @@ -7074,6 +7116,18 @@ CREATE TABLE ticket_assignment_operations ( .unwrap() .is_empty() ); + assert!( + store + .delete_worker_registry("workspace-control", &subject_record.worker) + .unwrap() + ); + assert!( + store + .get_worker_control_grant("workspace-control", &grant.grant_id) + .unwrap() + .is_none(), + "deleting a subject Worker cascades its durable control grants" + ); } #[tokio::test] diff --git a/resources/profiles/base.dcdl b/resources/profiles/base.dcdl index f8ab343c..04148c7b 100644 --- a/resources/profiles/base.dcdl +++ b/resources/profiles/base.dcdl @@ -26,8 +26,8 @@ feature = { memory = { enabled = true; }; web = { enabled = true; }; image = { enabled = true; }; - sub_worker = { enabled = true; }; - worker = { enabled = true; }; + sub_worker = { enabled = false; }; + worker = { enabled = false; }; objective = { enabled = true; }; ticket = { enabled = true; authoring = true; thread = true; }; }; diff --git a/resources/profiles/coder.dcdl b/resources/profiles/coder.dcdl index 74f3795b..27a85776 100644 --- a/resources/profiles/coder.dcdl +++ b/resources/profiles/coder.dcdl @@ -10,7 +10,7 @@ import "./base.dcdl" // { web = { enabled = true; }; sub_worker = { enabled = true; }; flow = { enabled = true; }; - worker = { enabled = false; }; + worker = { enabled = true; }; ticket = { enabled = true; thread = true; }; }; }