@@ -29,17 +29,16 @@ pub async fn cmd_list_channels(
2929 format : & crate :: OutputFormat ,
3030) -> Result < ( ) , CliError > {
3131 let effective_limit = limit. unwrap_or ( 500 ) ;
32- let raw = if member == Some ( true ) {
32+ let events = if member == Some ( true ) {
3333 // Step 1: find channel IDs where we're a member (kind:39002)
3434 let my_pk = client. keys ( ) . public_key ( ) . to_hex ( ) ;
3535 let member_filter = serde_json:: json!( {
3636 "kinds" : [ 39002 ] ,
3737 "#p" : [ my_pk] ,
38- "limit" : effective_limit
3938 } ) ;
40- let member_resp = client. query ( & member_filter ) . await ? ;
41- let member_events : Vec < serde_json :: Value > =
42- serde_json :: from_str ( & member_resp ) . unwrap_or_default ( ) ;
39+ let member_events = client
40+ . query_paginated ( member_filter , effective_limit )
41+ . await ? ;
4342 let channel_ids: Vec < String > = member_events
4443 . iter ( )
4544 . map ( extract_d_tag)
@@ -49,22 +48,21 @@ pub async fn cmd_list_channels(
4948 println ! ( "[]" ) ;
5049 return Ok ( ( ) ) ;
5150 }
52- // Step 2: fetch kind:39000 metadata for those channels
51+ // Step 2: fetch kind:39000 metadata for those channels.
5352 let metadata_filter = serde_json:: json!( {
5453 "kinds" : [ 39000 ] ,
5554 "#d" : channel_ids,
56- "limit" : effective_limit
5755 } ) ;
58- client. query ( & metadata_filter) . await ?
56+ client
57+ . query_paginated ( metadata_filter, effective_limit)
58+ . await ?
5959 } else {
6060 let filter = serde_json:: json!( {
6161 "kinds" : [ 39000 ] ,
62- "limit" : effective_limit
6362 } ) ;
64- client. query ( & filter) . await ?
63+ client. query_paginated ( filter, effective_limit ) . await ?
6564 } ;
6665
67- let events: Vec < serde_json:: Value > = serde_json:: from_str ( & raw) . unwrap_or_default ( ) ;
6866 let channels: Vec < serde_json:: Value > = events
6967 . iter ( )
7068 . filter ( |e| {
@@ -130,16 +128,8 @@ pub async fn cmd_search_channels(
130128
131129 let filter = serde_json:: json!( {
132130 "kinds" : [ 39000 ] ,
133- "limit" : limit,
134131 } ) ;
135- let raw = client. query ( & filter) . await ?;
136-
137- let events: serde_json:: Value = serde_json:: from_str ( & raw)
138- . map_err ( |e| CliError :: Other ( format ! ( "failed to parse response: {e}" ) ) ) ?;
139- let Some ( arr) = events. as_array ( ) else {
140- println ! ( "[]" ) ;
141- return Ok ( ( ) ) ;
142- } ;
132+ let arr = client. query_paginated ( filter, limit) . await ?;
143133
144134 let needle = query. to_ascii_lowercase ( ) ;
145135 let mut matches: Vec < ChannelSummary > = arr
@@ -337,14 +327,6 @@ pub async fn cmd_create_channel(
337327 Ok ( ( ) )
338328}
339329
340- /// Relay-side cap on a single historical query (`buzz-relay/src/handlers/req.rs`).
341- /// Never request above this — a clamped response compared against a larger
342- /// requested size would falsely look like "no more pages."
343- const RELAY_MAX_HISTORICAL_LIMIT : u32 = 2000 ;
344-
345- /// One page of a keyset-paginated kind:30177 scan.
346- const MANAGED_AGENT_PAGE_SIZE : u32 = RELAY_MAX_HISTORICAL_LIMIT ;
347-
348330/// A resolved live managed-agent instance backing a template persona slug.
349331#[ derive( Debug , Clone , PartialEq , Eq ) ]
350332struct ResolvedAgent {
@@ -424,62 +406,29 @@ async fn scan_managed_agents_by_owner(
424406 owner : & str ,
425407 slugs : & HashSet < & str > ,
426408) -> Result < Vec < ResolvedAgent > , CliError > {
409+ let filter = serde_json:: json!( {
410+ "kinds" : [ KIND_MANAGED_AGENT ] ,
411+ "authors" : [ owner] ,
412+ } ) ;
413+ let events = client. query_all ( filter) . await ?;
427414 let mut found: Vec < ResolvedAgent > = Vec :: new ( ) ;
428- let mut seen_event_ids: HashSet < String > = HashSet :: new ( ) ;
429- let mut cursor: Option < ( i64 , String ) > = None ;
430-
431- loop {
432- let mut filter = serde_json:: json!( {
433- "kinds" : [ KIND_MANAGED_AGENT ] ,
434- "authors" : [ owner] ,
435- "limit" : MANAGED_AGENT_PAGE_SIZE ,
436- } ) ;
437- if let Some ( ( until, ref before_id) ) = cursor {
438- filter[ "until" ] = serde_json:: json!( until) ;
439- filter[ "before_id" ] = serde_json:: json!( before_id) ;
440- }
441-
442- let raw = client. query ( & filter) . await ?;
443- let events: Vec < serde_json:: Value > = serde_json:: from_str ( & raw) . map_err ( |e| {
444- CliError :: Other ( format ! ( "failed to parse managed-agent query response: {e}" ) )
445- } ) ?;
446-
447- let page_len = events. len ( ) ;
448- for event in & events {
449- let Some ( event_id) = event. get ( "id" ) . and_then ( |v| v. as_str ( ) ) else {
450- continue ;
451- } ;
452- if !seen_event_ids. insert ( event_id. to_string ( ) ) {
453- continue ;
454- }
455- let pubkey = extract_d_tag ( event) ;
456- if pubkey. is_empty ( ) {
457- continue ;
458- }
459- let content: ManagedAgentContent = event
460- . get ( "content" )
461- . and_then ( |c| c. as_str ( ) )
462- . and_then ( |s| serde_json:: from_str ( s) . ok ( ) )
463- . unwrap_or ( ManagedAgentContent { persona_id : None } ) ;
464- let Some ( persona_id) = content. persona_id else {
465- continue ;
466- } ;
467- if slugs. contains ( persona_id. as_str ( ) ) {
468- found. push ( ResolvedAgent { persona_id, pubkey } ) ;
469- }
470- }
471415
472- if ( page_len as u32 ) < MANAGED_AGENT_PAGE_SIZE {
473- break ;
416+ for event in & events {
417+ let pubkey = extract_d_tag ( event) ;
418+ if pubkey. is_empty ( ) {
419+ continue ;
474420 }
475- let Some ( last) = events. last ( ) else { break } ;
476- let Some ( created_at) = last. get ( "created_at" ) . and_then ( |v| v. as_i64 ( ) ) else {
477- break ;
478- } ;
479- let Some ( last_id) = last. get ( "id" ) . and_then ( |v| v. as_str ( ) ) else {
480- break ;
421+ let content: ManagedAgentContent = event
422+ . get ( "content" )
423+ . and_then ( |c| c. as_str ( ) )
424+ . and_then ( |s| serde_json:: from_str ( s) . ok ( ) )
425+ . unwrap_or ( ManagedAgentContent { persona_id : None } ) ;
426+ let Some ( persona_id) = content. persona_id else {
427+ continue ;
481428 } ;
482- cursor = Some ( ( created_at, last_id. to_string ( ) ) ) ;
429+ if slugs. contains ( persona_id. as_str ( ) ) {
430+ found. push ( ResolvedAgent { persona_id, pubkey } ) ;
431+ }
483432 }
484433
485434 Ok ( found)
0 commit comments