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

runtime: make worker console observation required

Browse Source
This commit is contained in:
Hare
2026-06-28 02:11:43 +09:00
parent 135667417b
commit 67df7d1a53
11 changed files with 340 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace-server/src/companion.rs
+2 -1
View File
@@ -604,8 +604,9 @@ mod tests {
let runtime_transcript = registry
.transcript(COMPANION_RUNTIME_ID, &worker.worker_id, 0, 10)
.unwrap();
assert_eq!(runtime_transcript.items.len(), 1);
assert_eq!(runtime_transcript.items.len(), 2);
assert_eq!(runtime_transcript.items[0].role, "user");
assert_eq!(runtime_transcript.items[1].role, "assistant");
let browser_payload = serde_json::to_string(&(status, response)).unwrap();
for forbidden in [
crates/workspace-server/src/hosts.rs
+41 -34
View File
@@ -140,8 +140,6 @@ pub struct RuntimeCapabilitySummary {
pub can_spawn_worker: bool,
pub can_stop_worker: bool,
pub can_accept_input: bool,
pub can_stream_events: bool,
pub can_read_bounded_transcript: bool,
pub has_workspace_fs: bool,
pub has_shell: bool,
pub has_git: bool,
@@ -195,10 +193,8 @@ pub struct WorkerImplementationSummary {
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct WorkerCapabilitySummary {
pub can_accept_input: bool,
pub can_stream_events: bool,
pub can_stop: bool,
pub can_spawn_followup: bool,
pub can_read_bounded_transcript: bool,
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -578,7 +574,7 @@ pub trait WorkspaceWorkerRuntime: Send + Sync {
fn observation_source(
&self,
_worker_id: &str,
) -> Option<crate::observation::RuntimeObservationSourceConfig> {
) -> Option<crate::observation::RuntimeObservationSource> {
None
}
@@ -879,7 +875,7 @@ impl RuntimeRegistry {
&self,
runtime_id: &str,
worker_id: &str,
) -> Result<crate::observation::RuntimeObservationSourceConfig, RuntimeRegistryError> {
) -> Result<crate::observation::RuntimeObservationSource, RuntimeRegistryError> {
validate_backend_identifier("runtime_id", runtime_id)?;
validate_backend_identifier("worker_id", worker_id)?;
let runtime = self.runtime(runtime_id)?;
@@ -962,10 +958,8 @@ impl EmbeddedWorkerRuntime {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: true,
can_stream_events: false,
can_stop: false,
can_spawn_followup: false,
can_read_bounded_transcript: true,
},
diagnostics: vec![diagnostic(
"embedded_runtime_projection",
@@ -996,10 +990,8 @@ impl EmbeddedWorkerRuntime {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: true,
can_stream_events: false,
can_stop: false,
can_spawn_followup: false,
can_read_bounded_transcript: true,
},
diagnostics: vec![diagnostic(
"embedded_runtime_projection",
@@ -1245,6 +1237,24 @@ impl WorkspaceWorkerRuntime for EmbeddedWorkerRuntime {
}
}
fn observation_source(
&self,
worker_id: &str,
) -> Option<crate::observation::RuntimeObservationSource> {
let worker_ref = self.worker_ref(worker_id)?;
if self.runtime.worker_detail(&worker_ref).is_err() {
return None;
}
Some(crate::observation::RuntimeObservationSource::embedded(
crate::observation::EmbeddedRuntimeObservationSource {
runtime_id: self.runtime_id.clone(),
worker_id: worker_id.to_string(),
runtime: self.runtime.clone(),
worker_ref,
},
))
}
fn send_input(&self, worker_id: &str, request: WorkerInputRequest) -> WorkerInputResult {
let Some(worker_ref) = self.worker_ref(worker_id) else {
return embedded_input_rejected(
@@ -1512,10 +1522,8 @@ impl RemoteWorkerRuntime {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: true,
can_stream_events: true,
can_stop: true,
can_spawn_followup: false,
can_read_bounded_transcript: true,
},
diagnostics: vec![diagnostic(
"remote_runtime_projection",
@@ -1546,10 +1554,8 @@ impl RemoteWorkerRuntime {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: true,
can_stream_events: true,
can_stop: true,
can_spawn_followup: false,
can_read_bounded_transcript: true,
},
diagnostics: vec![diagnostic(
"remote_runtime_projection",
@@ -1811,13 +1817,15 @@ impl WorkspaceWorkerRuntime for RemoteWorkerRuntime {
fn observation_source(
&self,
worker_id: &str,
) -> Option<crate::observation::RuntimeObservationSourceConfig> {
Some(crate::observation::RuntimeObservationSourceConfig {
runtime_id: self.runtime_id.clone(),
worker_id: worker_id.to_string(),
endpoint: self.ws_endpoint(worker_id),
bearer_token: self.bearer_token.clone(),
})
) -> Option<crate::observation::RuntimeObservationSource> {
Some(crate::observation::RuntimeObservationSource::remote_ws(
crate::observation::RuntimeObservationSourceConfig {
runtime_id: self.runtime_id.clone(),
worker_id: worker_id.to_string(),
endpoint: self.ws_endpoint(worker_id),
bearer_token: self.bearer_token.clone(),
},
))
}
fn send_input(&self, worker_id: &str, request: WorkerInputRequest) -> WorkerInputResult {
@@ -1871,8 +1879,6 @@ fn embedded_runtime_capabilities(limit: usize, available: bool) -> RuntimeCapabi
can_spawn_worker: available,
can_stop_worker: false,
can_accept_input: available,
can_stream_events: false,
can_read_bounded_transcript: available,
has_workspace_fs: false,
has_shell: false,
has_git: false,
@@ -2048,6 +2054,7 @@ fn embedded_transcript_rejected(
fn embedded_transcript_role_label(role: TranscriptRole) -> &'static str {
match role {
TranscriptRole::User => "user",
TranscriptRole::Assistant => "assistant",
TranscriptRole::System => "system",
}
}
@@ -2139,8 +2146,6 @@ fn remote_runtime_capabilities(limit: usize, available: bool) -> RuntimeCapabili
can_spawn_worker: available,
can_stop_worker: available,
can_accept_input: available,
can_stream_events: available,
can_read_bounded_transcript: available,
has_workspace_fs: false,
has_shell: false,
has_git: false,
@@ -2357,10 +2362,8 @@ pub fn placeholder_worker(host_id: impl Into<String>) -> WorkerSummary {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: false,
can_stream_events: false,
can_stop: false,
can_spawn_followup: false,
can_read_bounded_transcript: false,
},
diagnostics: vec![diagnostic(
"runtime_capability_unsupported",
@@ -2450,10 +2453,8 @@ mod tests {
},
capabilities: WorkerCapabilitySummary {
can_accept_input: false,
can_stream_events: false,
can_stop: false,
can_spawn_followup: false,
can_read_bounded_transcript: false,
},
diagnostics: Vec::new(),
}],
@@ -2481,8 +2482,6 @@ mod tests {
can_spawn_worker: false,
can_stop_worker: false,
can_accept_input: false,
can_stream_events: false,
can_read_bounded_transcript: false,
has_workspace_fs: false,
has_shell: false,
has_git: false,
@@ -2613,7 +2612,6 @@ mod tests {
assert_eq!(embedded_summary.source.status, RuntimeSourceStatus::Active);
assert!(embedded_summary.capabilities.can_spawn_worker);
assert!(embedded_summary.capabilities.can_accept_input);
assert!(embedded_summary.capabilities.can_read_bounded_transcript);
let spawned = registry
.spawn_worker(
@@ -2647,7 +2645,6 @@ mod tests {
assert_eq!(worker.implementation.kind, "embedded_worker_runtime");
assert_eq!(worker.profile.as_deref(), Some("builtin:coder"));
assert!(worker.capabilities.can_accept_input);
assert!(worker.capabilities.can_read_bounded_transcript);
let input = registry
.send_input(
@@ -2668,9 +2665,15 @@ mod tests {
.transcript(EMBEDDED_RUNTIME_ID, &worker.worker_id, 0, 10)
.unwrap();
assert_eq!(transcript.state, WorkerOperationState::Accepted);
assert_eq!(transcript.items.len(), 1);
assert_eq!(transcript.items.len(), 2);
assert_eq!(transcript.items[0].role, "user");
assert_eq!(transcript.items[0].content, "hello embedded runtime");
assert_eq!(transcript.items[1].role, "assistant");
assert!(
transcript.items[1]
.content
.contains("LLM execution is not connected")
);
let json = serde_json::to_string(&(embedded_summary, worker, transcript)).unwrap();
for forbidden in [
@@ -2810,6 +2813,10 @@ mod tests {
let observation = registry
.observation_source("remote:primary", "worker-remote-1")
.expect("remote runtime exposes backend-owned WS observation source");
let crate::observation::RuntimeObservationSource::RemoteWs(observation) = observation
else {
panic!("remote runtime should expose a remote WS observation source");
};
assert!(observation.endpoint.starts_with("ws://127.0.0.1:"));
assert!(
observation
crates/workspace-server/src/observation.rs
+232 -1
View File
@@ -1,6 +1,9 @@
use std::collections::{BTreeMap, VecDeque};
use std::sync::{Arc, Mutex};
use worker_runtime::identity::WorkerRef;
use worker_runtime::observation::{WorkerObservationCursor, WorkerObservationEvent};
use axum::http::StatusCode;
use futures::{SinkExt, StreamExt};
use serde::{Deserialize, Serialize};
@@ -32,6 +35,66 @@ impl std::fmt::Debug for RuntimeObservationSourceConfig {
}
}
#[derive(Clone)]
pub struct EmbeddedRuntimeObservationSource {
pub runtime_id: String,
pub worker_id: String,
pub runtime: worker_runtime::Runtime,
pub worker_ref: WorkerRef,
}
#[derive(Clone)]
pub enum RuntimeObservationSource {
RemoteWs(RuntimeObservationSourceConfig),
Embedded(EmbeddedRuntimeObservationSource),
}
impl RuntimeObservationSource {
pub fn remote_ws(config: RuntimeObservationSourceConfig) -> Self {
Self::RemoteWs(config)
}
pub fn embedded(source: EmbeddedRuntimeObservationSource) -> Self {
Self::Embedded(source)
}
pub fn runtime_id(&self) -> &str {
match self {
Self::RemoteWs(config) => &config.runtime_id,
Self::Embedded(source) => &source.runtime_id,
}
}
pub fn worker_id(&self) -> &str {
match self {
Self::RemoteWs(config) => &config.worker_id,
Self::Embedded(source) => &source.worker_id,
}
}
}
impl std::fmt::Debug for RuntimeObservationSource {
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::RemoteWs(config) => formatter
.debug_struct("RemoteRuntimeObservationSource")
.field("runtime_id", &config.runtime_id)
.field("worker_id", &config.worker_id)
.field("endpoint", &"<backend-private>")
.field(
"bearer_token",
&config.bearer_token.as_ref().map(|_| "<redacted>"),
)
.finish(),
Self::Embedded(source) => formatter
.debug_struct("EmbeddedRuntimeObservationSource")
.field("runtime_id", &source.runtime_id)
.field("worker_id", &source.worker_id)
.finish(),
}
}
}
/// Event consumed from a Runtime-owned worker observation WebSocket.
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct RuntimeObservationUpstreamEvent {
@@ -234,13 +297,14 @@ impl BackendObservationProxy {
&self,
runtime_id: &str,
worker_id: &str,
) -> Result<RuntimeObservationSourceConfig, ObservationProxyError> {
) -> Result<RuntimeObservationSource, ObservationProxyError> {
self.sources
.get(&ObservationKey {
runtime_id: runtime_id.to_string(),
worker_id: worker_id.to_string(),
})
.cloned()
.map(RuntimeObservationSource::remote_ws)
.ok_or_else(|| {
ObservationProxyError::WorkerNotFound(format!(
"worker {worker_id} is not registered for runtime {runtime_id}"
@@ -499,6 +563,173 @@ impl RuntimeWsObservationClient {
}
}
pub enum RuntimeObservationClient {
RemoteWs(RuntimeWsObservationClient),
Embedded(EmbeddedObservationClient),
}
impl RuntimeObservationClient {
pub async fn connect(
source: &RuntimeObservationSource,
runtime_cursor: Option<&str>,
) -> Result<Self, ObservationProxyError> {
match source {
RuntimeObservationSource::RemoteWs(config) => {
RuntimeWsObservationClient::connect(config, runtime_cursor)
.await
.map(Self::RemoteWs)
}
RuntimeObservationSource::Embedded(source) => {
EmbeddedObservationClient::connect(source, runtime_cursor).map(Self::Embedded)
}
}
}
pub async fn next_event(
&mut self,
) -> Result<RuntimeObservationUpstreamEvent, ObservationProxyError> {
match self {
Self::RemoteWs(client) => client.next_event().await,
Self::Embedded(client) => client.next_event().await,
}
}
}
pub struct EmbeddedObservationClient {
runtime_id: String,
worker_id: String,
worker_ref: WorkerRef,
cursor: WorkerObservationCursor,
receiver: tokio::sync::broadcast::Receiver<WorkerObservationEvent>,
queued: VecDeque<RuntimeObservationUpstreamEvent>,
}
impl EmbeddedObservationClient {
fn connect(
source: &EmbeddedRuntimeObservationSource,
runtime_cursor: Option<&str>,
) -> Result<Self, ObservationProxyError> {
let cursor = match runtime_cursor {
Some(raw) => WorkerObservationCursor::decode(raw).ok_or_else(|| {
ObservationProxyError::CursorMalformed(
"embedded runtime cursor is malformed".into(),
)
})?,
None => source
.runtime
.worker_observation_cursor_now(&source.worker_ref)
.map_err(|err| {
ObservationProxyError::WorkerNotFound(format!(
"embedded Worker '{}' is not observable: {err}",
source.worker_id
))
})?,
};
let receiver = source
.runtime
.subscribe_worker_observation()
.map_err(|err| {
ObservationProxyError::WorkerNotFound(format!(
"embedded Worker '{}' observation subscription is unavailable: {err}",
source.worker_id
))
})?;
let mut queued = VecDeque::new();
if runtime_cursor.is_none() {
let snapshot = source
.runtime
.worker_observation_snapshot(&source.worker_ref)
.map_err(|err| {
ObservationProxyError::WorkerNotFound(format!(
"embedded Worker '{}' snapshot is unavailable: {err}",
source.worker_id
))
})?;
queued.push_back(RuntimeObservationUpstreamEvent {
runtime_id: source.runtime_id.clone(),
worker_id: source.worker_id.clone(),
runtime_cursor: cursor.encode(),
payload: snapshot,
});
}
for event in source
.runtime
.read_worker_observation_events(&source.worker_ref, cursor)
.map_err(|err| {
ObservationProxyError::CursorUnknownOrExpired(format!(
"embedded Worker '{}' cursor is unavailable: {err}",
source.worker_id
))
})?
{
queued.push_back(Self::map_event(
&source.runtime_id,
&source.worker_id,
event,
));
}
Ok(Self {
runtime_id: source.runtime_id.clone(),
worker_id: source.worker_id.clone(),
worker_ref: source.worker_ref.clone(),
cursor,
receiver,
queued,
})
}
async fn next_event(
&mut self,
) -> Result<RuntimeObservationUpstreamEvent, ObservationProxyError> {
if let Some(event) = self.queued.pop_front() {
if let Some(cursor) = WorkerObservationCursor::decode(&event.runtime_cursor) {
self.cursor = cursor;
}
return Ok(event);
}
loop {
match self.receiver.recv().await {
Ok(event)
if event.worker_ref == self.worker_ref
&& event.sequence > self.cursor.sequence =>
{
self.cursor =
WorkerObservationCursor::decode(&event.cursor).ok_or_else(|| {
ObservationProxyError::CursorMalformed(
"embedded runtime emitted a malformed cursor".into(),
)
})?;
return Ok(Self::map_event(&self.runtime_id, &self.worker_id, event));
}
Ok(_) => continue,
Err(tokio::sync::broadcast::error::RecvError::Lagged(_)) => {
return Err(ObservationProxyError::CursorUnknownOrExpired(
"embedded runtime observation backlog was exceeded".into(),
));
}
Err(tokio::sync::broadcast::error::RecvError::Closed) => {
return Err(ObservationProxyError::UpstreamDisconnect(
"embedded runtime observation stream closed".into(),
));
}
}
}
}
fn map_event(
runtime_id: &str,
worker_id: &str,
event: WorkerObservationEvent,
) -> RuntimeObservationUpstreamEvent {
RuntimeObservationUpstreamEvent {
runtime_id: runtime_id.to_string(),
worker_id: worker_id.to_string(),
runtime_cursor: event.cursor,
payload: event.payload,
}
}
}
#[cfg(test)]
mod tests {
use super::*;
crates/workspace-server/src/server.rs
+5 -5
View File
@@ -26,7 +26,7 @@ use crate::hosts::{
use crate::identity::WorkspaceIdentity;
use crate::observation::{
BackendObservationProxy, ClientWorkerEventWsFrame, ClientWorkerEventsWsQuery,
ObservationProxyError, RuntimeObservationSourceConfig, RuntimeWsObservationClient,
ObservationProxyError, RuntimeObservationClient, RuntimeObservationSourceConfig,
};
use crate::records::{
LocalProjectRecordReader, ObjectiveDetail, ProjectRecordList, TicketDetail, TicketSummary,
@@ -676,13 +676,13 @@ async fn worker_observation_ws(
async fn worker_observation_ws_session(
proxy: BackendObservationProxy,
source: RuntimeObservationSourceConfig,
source: crate::observation::RuntimeObservationSource,
query: ClientWorkerEventsWsQuery,
mut socket: WebSocket,
) {
let open = match proxy.open(
&source.runtime_id,
&source.worker_id,
source.runtime_id(),
source.worker_id(),
query.cursor.as_deref(),
) {
Ok(open) => open,
@@ -703,7 +703,7 @@ async fn worker_observation_ws_session(
}
let mut upstream =
match RuntimeWsObservationClient::connect(&source, open.runtime_cursor.as_deref()).await {
match RuntimeObservationClient::connect(&source, open.runtime_cursor.as_deref()).await {
Ok(client) => client,
Err(error) => {
let _ =