@@ -6,8 +6,8 @@ use crate::{
66 managed_agents:: {
77 build_managed_agent_summary, current_instance_id, discover_provider_candidates,
88 ensure_persona_is_active, find_managed_agent_mut, load_managed_agents, load_personas,
9- load_teams, managed_agent_avatar_url, managed_agents_base_dir , normalize_agent_args ,
10- provider_deploy , resolve_provider_binary, save_managed_agents, start_managed_agent_process,
9+ load_teams, managed_agent_avatar_url, normalize_agent_args , provider_deploy ,
10+ resolve_provider_binary, save_managed_agents, start_managed_agent_process,
1111 stop_managed_agent_process, stop_managed_agent_workspace_pair,
1212 sync_managed_agent_processes, try_regenerate_nest, validate_provider_config, BackendKind ,
1313 CreateManagedAgentRequest , CreateManagedAgentResponse , ManagedAgentRecord ,
@@ -18,8 +18,7 @@ use crate::{
1818 util:: now_iso,
1919} ;
2020
21- /// Read the workspace owner's pubkey hex from app state without holding the
22- /// lock for longer than necessary. Used to populate `BUZZ_ACP_AGENT_OWNER`
21+ /// Read the workspace owner pubkey without holding the lock. Used to populate `BUZZ_ACP_AGENT_OWNER`
2322/// as a fallback for legacy agent records that have no NIP-OA `auth_tag`.
2423pub ( super ) fn workspace_owner_hex ( state : & AppState ) -> Result < String , String > {
2524 let keys = state. keys . lock ( ) . map_err ( |e| e. to_string ( ) ) ?;
@@ -48,12 +47,12 @@ pub(super) fn retain_managed_agent_pending(
4847 use crate :: managed_agents:: { reconcile:: retain_agent_record, retention:: open_retention_db} ;
4948
5049 let result = ( || -> Result < ( ) , String > {
51- let conn = open_retention_db ( & managed_agents_base_dir ( app) ? . join ( "retention.db" ) ) ?;
52- let keys = state . signing_keys ( ) ?;
50+ let scope = crate :: managed_agents :: retention :: active_retention_scope ( app, state ) ?;
51+ let conn = open_retention_db ( & scope . db_path ) ?;
5352 // Shared engine with the boot-time reconcile: projection content diff
5453 // (no republish for runtime-only churn) + monotonic created_at bump
5554 // past the retained head (NIP-AP step 3).
56- retain_agent_record ( & conn, & keys , record) . map ( |_| ( ) )
55+ retain_agent_record ( & conn, & scope . owner_keys , record) . map ( |_| ( ) )
5756 } ) ( ) ;
5857 if let Err ( e) = result {
5958 eprintln ! ( "buzz-desktop: agent-retain: {e}" ) ;
@@ -89,15 +88,12 @@ pub(super) fn tombstone_managed_agent_pending(
8988 const KIND_DELETE : u32 = 5 ;
9089
9190 let result = ( || -> Result < ( ) , String > {
92- let ( owner_pubkey, event) = {
93- let keys = state. signing_keys ( ) ?;
94- let owner_pubkey = keys. public_key ( ) . to_hex ( ) ;
95- let event = build_agent_delete ( agent_pubkey, & owner_pubkey) ?
96- . sign_with_keys ( & keys)
97- . map_err ( |e| format ! ( "failed to sign managed-agent tombstone: {e}" ) ) ?;
98- ( owner_pubkey, event)
99- } ;
100- let conn = open_retention_db ( & managed_agents_base_dir ( app) ?. join ( "retention.db" ) ) ?;
91+ let scope = crate :: managed_agents:: retention:: active_retention_scope ( app, state) ?;
92+ let owner_pubkey = scope. owner_keys . public_key ( ) . to_hex ( ) ;
93+ let event = build_agent_delete ( agent_pubkey, & owner_pubkey) ?
94+ . sign_with_keys ( & scope. owner_keys )
95+ . map_err ( |e| format ! ( "failed to sign managed-agent tombstone: {e}" ) ) ?;
96+ let conn = open_retention_db ( & scope. db_path ) ?;
10197 delete_retained_event ( & conn, KIND_MANAGED_AGENT , & owner_pubkey, agent_pubkey) ?;
10298 retain_event (
10399 & conn,
@@ -183,13 +179,10 @@ pub(super) fn archive_managed_agent_pending(app: &AppHandle, state: &AppState, a
183179 use nostr:: JsonUtil ;
184180
185181 let result = ( || -> Result < ( ) , String > {
186- let ( owner_pubkey, event) = {
187- let keys = state. signing_keys ( ) ?;
188- let owner_pubkey = keys. public_key ( ) . to_hex ( ) ;
189- let event = build_agent_archive_request ( & keys, agent_pubkey) ?;
190- ( owner_pubkey, event)
191- } ;
192- let conn = open_retention_db ( & managed_agents_base_dir ( app) ?. join ( "retention.db" ) ) ?;
182+ let scope = crate :: managed_agents:: retention:: active_retention_scope ( app, state) ?;
183+ let owner_pubkey = scope. owner_keys . public_key ( ) . to_hex ( ) ;
184+ let event = build_agent_archive_request ( & scope. owner_keys , agent_pubkey) ?;
185+ let conn = open_retention_db ( & scope. db_path ) ?;
193186 retain_event (
194187 & conn,
195188 & RetainedEvent {
@@ -904,8 +897,10 @@ pub async fn create_managed_agent(
904897 name_pool : Vec :: new ( ) ,
905898 is_builtin : false ,
906899 is_active : true ,
900+ shared : false ,
907901 source_team : None ,
908902 source_team_persona_slug : None ,
903+ catalog_source : None ,
909904 definition_respond_to : None ,
910905 definition_respond_to_allowlist : Vec :: new ( ) ,
911906 definition_parallelism : None ,
0 commit comments