Skip to content

fix(broker): record workspace_id from agent registration response #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willwashburn merged 4 commits into from
Jun 23, 2026
Merged

fix(broker): record workspace_id from agent registration response #1175

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d548af
fix(broker): record workspace_id from agent registration response
barryonthecape Jun 19, 2026
48b0c10
style: auto-format Rust code with cargo fmt
github-actions[bot] Jun 19, 2026
f570b9a
fix(broker): bump relaycast to 4.1.1 for workspace_id field
willwashburn Jun 23, 2026
5ab136a
Merge branch 'main' into fix/broker-resolve-workspace-id
willwashburn Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions crates/broker/src/relaycast/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,12 +699,7 @@ impl AuthClient {
.register_or_get_agent(request)
.await
.map_err(relay_error_to_anyhow)?;
return Ok((
result.id,
result.name,
result.token,
None, // workspace_id not returned in CreateAgentResponse
));
return Ok((result.id, result.name, result.token, result.workspace_id));
}

loop {
Expand All @@ -717,12 +712,7 @@ impl AuthClient {

match relay.register_agent(request).await {
Ok(result) => {
return Ok((
result.id,
result.name,
result.token,
None, // workspace_id not returned in CreateAgentResponse
));
return Ok((result.id, result.name, result.token, result.workspace_id));
}
Err(RelayError::Api { code, status, .. })
if is_conflict_code(&code) || status == 409 =>
Expand Down Expand Up @@ -1068,20 +1058,24 @@ mod tests {
unsafe {
std::env::set_var("AGENT_RELAY_WORKSPACE_KEY", "rk_live_env");
}
// The register response now carries workspace_id, so a join-by-key
// session records the real workspace instead of the "ws_unknown"
// fallback — no extra lookup required.
let register = server.mock(|when, then| {
when.method(POST)
.path("/v1/agents")
.header("authorization", "Bearer rk_live_env");
then.status(200)
.header("content-type", "application/json")
.body(r#"{"ok":true,"data":{"id":"a2","name":"lead","token":"at_live_2","status":"online","created_at":"2025-01-01T00:00:00Z"}}"#);
.body(r#"{"ok":true,"data":{"id":"a2","workspace_id":"ws_env","name":"lead","token":"at_live_2","status":"online","created_at":"2025-01-01T00:00:00Z"}}"#);
});

let client = AuthClient::new(server.base_url());

let session = client.startup_session(Some("lead")).await.unwrap();
assert_eq!(session.token, "at_live_2");
assert_eq!(session.credentials.api_key, "rk_live_env");
assert_eq!(session.credentials.workspace_id, "ws_env");
register.assert_hits(1);

unsafe {
Expand Down
Loading