Skip to content

Commit 125f3d7

Browse files
wesbillmanCarl
andcommitted
Make inbound agent authority merge exhaustive
Destructure every managed-agent field at the relay-to-device boundary so new fields cannot silently inherit the wrong authority class. Apply only portable state while preserving device policy, derived commands, paths, timestamps, and runtime receipts. Co-authored-by: Carl <c7ebe626f000404285d3686e1dc74cc07cc60a9754a150041ba132e14bd3e2ec@buzz.block.builderlab.xyz> Signed-off-by: Wes <[email protected]>
1 parent 2d10774 commit 125f3d7

1 file changed

Lines changed: 96 additions & 19 deletions

File tree

‎desktop/src-tauri/src/commands/personas/inbound.rs‎

Lines changed: 96 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -334,25 +334,102 @@ fn reconcile_inbound_private_managed_agent(
334334
}
335335

336336
fn merge_reconstructed_managed_agent(local: &mut ManagedAgentRecord, inbound: ManagedAgentRecord) {
337-
let start_on_app_launch = local.start_on_app_launch;
338-
let auto_restart = local.auto_restart_on_config_change;
339-
let provider_binary_path = local.provider_binary_path.clone();
340-
let runtime_pid = local.runtime_pid;
341-
let last_started_at = local.last_started_at.clone();
342-
let last_stopped_at = local.last_stopped_at.clone();
343-
let last_exit_code = local.last_exit_code;
344-
let last_error = local.last_error.clone();
345-
let last_error_code = local.last_error_code;
346-
*local = inbound;
347-
local.start_on_app_launch = start_on_app_launch;
348-
local.auto_restart_on_config_change = auto_restart;
349-
local.provider_binary_path = provider_binary_path;
350-
local.runtime_pid = runtime_pid;
351-
local.last_started_at = last_started_at;
352-
local.last_stopped_at = last_stopped_at;
353-
local.last_exit_code = last_exit_code;
354-
local.last_error = last_error;
355-
local.last_error_code = last_error_code;
337+
// Deliberately exhaustive: adding a record field forces this authority
338+
// boundary to classify it as relay-portable or device-local at compile time.
339+
let ManagedAgentRecord {
340+
pubkey,
341+
name,
342+
persona_id,
343+
team_id,
344+
private_key_nsec,
345+
auth_tag,
346+
relay_url,
347+
avatar_url,
348+
acp_command: _,
349+
agent_command: _,
350+
agent_command_override,
351+
agent_args,
352+
mcp_command: _,
353+
turn_timeout_seconds: _,
354+
idle_timeout_seconds,
355+
max_turn_duration_seconds,
356+
parallelism,
357+
system_prompt,
358+
model,
359+
provider,
360+
persona_source_version: _,
361+
env_vars,
362+
start_on_app_launch: _,
363+
auto_restart_on_config_change: _,
364+
runtime_pid: _,
365+
backend,
366+
backend_agent_id,
367+
provider_binary_path: _,
368+
persona_team_dir: _,
369+
persona_name_in_team,
370+
created_at: _,
371+
updated_at,
372+
last_started_at: _,
373+
last_stopped_at: _,
374+
last_exit_code: _,
375+
last_error: _,
376+
last_error_code: _,
377+
respond_to,
378+
respond_to_allowlist,
379+
display_name,
380+
slug,
381+
runtime,
382+
name_pool,
383+
is_builtin,
384+
is_active,
385+
shared: _,
386+
source_team,
387+
source_team_persona_slug,
388+
catalog_source,
389+
definition_respond_to,
390+
definition_respond_to_allowlist,
391+
definition_parallelism,
392+
relay_mesh,
393+
relay_authority,
394+
} = inbound;
395+
396+
local.pubkey = pubkey;
397+
local.name = name;
398+
local.persona_id = persona_id;
399+
local.team_id = team_id;
400+
local.private_key_nsec = private_key_nsec;
401+
local.auth_tag = auth_tag;
402+
local.relay_url = relay_url;
403+
local.avatar_url = avatar_url;
404+
local.agent_command_override = agent_command_override;
405+
local.agent_args = agent_args;
406+
local.idle_timeout_seconds = idle_timeout_seconds;
407+
local.max_turn_duration_seconds = max_turn_duration_seconds;
408+
local.parallelism = parallelism;
409+
local.system_prompt = system_prompt;
410+
local.model = model;
411+
local.provider = provider;
412+
local.env_vars = env_vars;
413+
local.backend = backend;
414+
local.backend_agent_id = backend_agent_id;
415+
local.persona_name_in_team = persona_name_in_team;
416+
local.updated_at = updated_at;
417+
local.respond_to = respond_to;
418+
local.respond_to_allowlist = respond_to_allowlist;
419+
local.display_name = display_name;
420+
local.slug = slug;
421+
local.runtime = runtime;
422+
local.name_pool = name_pool;
423+
local.is_builtin = is_builtin;
424+
local.is_active = is_active;
425+
local.source_team = source_team;
426+
local.source_team_persona_slug = source_team_persona_slug;
427+
local.catalog_source = catalog_source;
428+
local.definition_respond_to = definition_respond_to;
429+
local.definition_respond_to_allowlist = definition_respond_to_allowlist;
430+
local.definition_parallelism = definition_parallelism;
431+
local.relay_mesh = relay_mesh;
432+
local.relay_authority = relay_authority;
356433
}
357434

358435
pub(crate) fn reconstruct_managed_agent_from_payload(

0 commit comments

Comments
 (0)