agent-relay 0.4.1

Agent-to-agent messaging for AI coding tools. Local or networked — run a relay server and let Claude talk to Gemini across the internet.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
//! HTTP relay server with SQLite persistence.
//!
//! Messages survive server restarts. Run with:
//!   `agent-relay server --port 4800`
//!
//! Data stored in `~/.agent-relay/relay.db` by default.

use axum::{
    extract::{Path as AxumPath, Query, State},
    http::{HeaderMap, StatusCode},
    routing::{get, post},
    Json, Router,
};
use rusqlite::Connection;
use serde::{Deserialize, Serialize};
use std::path::Path;
use std::sync::{Arc, Mutex};

use crate::hub;
use crate::{AgentRegistration, Message};

// ── Shared state ──

pub type SharedState = Arc<Mutex<Connection>>;

/// Initialize the database schema.
pub fn init_db(conn: &Connection) {
    conn.execute_batch(
        "CREATE TABLE IF NOT EXISTS messages (
            id TEXT PRIMARY KEY,
            from_session TEXT NOT NULL,
            from_agent TEXT NOT NULL,
            to_session TEXT,
            content TEXT NOT NULL,
            timestamp INTEGER NOT NULL
        );
        CREATE TABLE IF NOT EXISTS message_reads (
            message_id TEXT NOT NULL,
            session_id TEXT NOT NULL,
            PRIMARY KEY (message_id, session_id)
        );
        CREATE TABLE IF NOT EXISTS agents (
            session_id TEXT PRIMARY KEY,
            agent_id TEXT NOT NULL,
            pid INTEGER NOT NULL,
            registered_at INTEGER NOT NULL,
            last_heartbeat INTEGER NOT NULL,
            metadata TEXT NOT NULL DEFAULT '{}'
        );",
    )
    .expect("Failed to initialize database schema");

    hub::init_hub_tables(conn);
}

// ── Request/Response types ──

#[derive(Deserialize)]
pub struct SendRequest {
    pub from_session: String,
    pub from_agent: String,
    pub to_session: Option<String>,
    pub content: String,
    pub team_id: Option<String>,
    pub channel: Option<String>,
}

#[derive(Deserialize)]
pub struct InboxQuery {
    pub session: String,
    #[serde(default = "default_limit")]
    pub limit: usize,
    pub team: Option<String>,
    pub channel: Option<String>,
}

fn default_limit() -> usize {
    50
}

#[derive(Deserialize)]
pub struct RegisterRequest {
    pub session_id: String,
    pub agent_id: String,
    pub pid: u32,
    #[serde(default)]
    pub metadata: serde_json::Value,
}

#[derive(Serialize)]
pub struct CountResponse {
    pub count: u64,
}

// ── Router ──

/// Build the router with a SQLite-backed database at the given path.
pub fn build_router(db_path: &Path) -> Router {
    let conn = Connection::open(db_path).expect("Failed to open SQLite database");
    conn.execute_batch("PRAGMA journal_mode=WAL; PRAGMA busy_timeout=5000;")
        .expect("Failed to set pragmas");
    init_db(&conn);

    let state: SharedState = Arc::new(Mutex::new(conn));

    Router::new()
        .route("/health", get(health))
        .route("/agents", get(list_agents))
        .route("/agents/register", post(register_agent))
        .route("/agents/unregister", post(unregister_agent))
        .route("/messages/send", post(send_message))
        .route("/messages/inbox", get(inbox))
        .route("/messages/unread", get(unread_count))
        // Auth routes
        .route("/auth/signup", post(signup))
        .route("/auth/login", post(login))
        // Team routes
        .route("/teams", post(create_team).get(list_teams))
        .route("/teams/join", post(join_team))
        .route("/teams/{team_id}/invite", post(create_invite))
        .route("/teams/{team_id}/members", get(list_members))
        .route("/teams/{team_id}/kick", post(kick_member))
        // Channel routes
        .route(
            "/teams/{team_id}/channels",
            post(create_channel).get(list_channels),
        )
        .layer(
            tower_http::cors::CorsLayer::new()
                .allow_origin(tower_http::cors::Any)
                .allow_methods([
                    axum::http::Method::GET,
                    axum::http::Method::POST,
                ])
                .allow_headers([axum::http::header::CONTENT_TYPE, axum::http::header::AUTHORIZATION])
                .max_age(std::time::Duration::from_secs(3600)),
        )
        .with_state(state)
}

// ── Handlers ──

async fn health() -> &'static str {
    "agent-relay server ok"
}

async fn register_agent(
    State(state): State<SharedState>,
    Json(req): Json<RegisterRequest>,
) -> (StatusCode, Json<AgentRegistration>) {
    let now = crate::Relay::now();
    let metadata_str = req.metadata.to_string();

    let conn = state.lock().unwrap();
    conn.execute(
        "INSERT OR REPLACE INTO agents (session_id, agent_id, pid, registered_at, last_heartbeat, metadata)
         VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
        rusqlite::params![req.session_id, req.agent_id, req.pid, now, now, metadata_str],
    )
    .expect("Failed to insert agent");

    let reg = AgentRegistration {
        session_id: req.session_id,
        agent_id: req.agent_id,
        pid: req.pid,
        registered_at: now,
        last_heartbeat: now,
        metadata: req.metadata,
    };

    (StatusCode::CREATED, Json(reg))
}

async fn unregister_agent(
    State(state): State<SharedState>,
    Json(req): Json<serde_json::Value>,
) -> StatusCode {
    let session = req["session_id"].as_str().unwrap_or("");
    let conn = state.lock().unwrap();
    let _ = conn.execute("DELETE FROM agents WHERE session_id = ?1", [session]);
    StatusCode::OK
}

async fn list_agents(State(state): State<SharedState>) -> Json<Vec<AgentRegistration>> {
    let conn = state.lock().unwrap();
    let mut stmt = conn
        .prepare("SELECT session_id, agent_id, pid, registered_at, last_heartbeat, metadata FROM agents ORDER BY last_heartbeat DESC")
        .unwrap();

    let agents: Vec<AgentRegistration> = stmt
        .query_map([], |row| {
            let metadata_str: String = row.get(5)?;
            Ok(AgentRegistration {
                session_id: row.get(0)?,
                agent_id: row.get(1)?,
                pid: row.get::<_, u32>(2)?,
                registered_at: row.get(3)?,
                last_heartbeat: row.get(4)?,
                metadata: serde_json::from_str(&metadata_str).unwrap_or_default(),
            })
        })
        .unwrap()
        .filter_map(|r| r.ok())
        .collect();

    Json(agents)
}

async fn send_message(
    State(state): State<SharedState>,
    Json(req): Json<SendRequest>,
) -> Result<(StatusCode, Json<Message>), (StatusCode, String)> {
    // SECURITY: Enforce message size limits to prevent abuse
    if req.content.len() > 10_000 {
        return Err((
            StatusCode::PAYLOAD_TOO_LARGE,
            "Message content exceeds 10KB limit".to_string(),
        ));
    }
    if req.content.is_empty() {
        return Err((
            StatusCode::BAD_REQUEST,
            "Message content cannot be empty".to_string(),
        ));
    }

    let now = crate::Relay::now();
    let id = format!("msg-{}", &uuid::Uuid::new_v4().to_string()[..8]);

    let conn = state.lock().unwrap();
    conn.execute(
        "INSERT INTO messages (id, from_session, from_agent, to_session, content, timestamp, team_id, channel)
         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
        rusqlite::params![
            id,
            req.from_session,
            req.from_agent,
            req.to_session,
            req.content,
            now,
            req.team_id,
            req.channel.as_deref().unwrap_or("general")
        ],
    )
    .expect("Failed to insert message");

    // Mark as read by sender
    let _ = conn.execute(
        "INSERT OR IGNORE INTO message_reads (message_id, session_id) VALUES (?1, ?2)",
        rusqlite::params![id, req.from_session],
    );

    let msg = Message {
        id,
        from_session: req.from_session,
        from_agent: req.from_agent,
        to_session: req.to_session,
        content: req.content,
        timestamp: now,
        read_by: vec![],
    };

    Ok((StatusCode::CREATED, Json(msg)))
}

async fn inbox(
    State(state): State<SharedState>,
    Query(q): Query<InboxQuery>,
) -> Json<Vec<Message>> {
    let conn = state.lock().unwrap();

    let mut sql = String::from(
        "SELECT id, from_session, from_agent, to_session, content, timestamp
         FROM messages
         WHERE (to_session IS NULL OR to_session = ?1 OR from_session = ?1)",
    );
    let mut params: Vec<Box<dyn rusqlite::types::ToSql>> = vec![
        Box::new(q.session.clone()),
    ];

    if let Some(ref team) = q.team {
        params.push(Box::new(team.clone()));
        sql.push_str(&format!(" AND team_id = ?{}", params.len()));
    }
    if let Some(ref channel) = q.channel {
        params.push(Box::new(channel.clone()));
        sql.push_str(&format!(" AND channel = ?{}", params.len()));
    }

    params.push(Box::new(q.limit as i64));
    sql.push_str(&format!(" ORDER BY timestamp DESC LIMIT ?{}", params.len()));

    let mut stmt = conn.prepare(&sql).unwrap();
    let param_refs: Vec<&dyn rusqlite::types::ToSql> = params.iter().map(|p| p.as_ref()).collect();

    let messages: Vec<Message> = stmt
        .query_map(param_refs.as_slice(), |row| {
            Ok(Message {
                id: row.get(0)?,
                from_session: row.get(1)?,
                from_agent: row.get(2)?,
                to_session: row.get(3)?,
                content: row.get(4)?,
                timestamp: row.get(5)?,
                read_by: vec![],
            })
        })
        .unwrap()
        .filter_map(|r| r.ok())
        .collect();

    // Mark all returned messages as read by this session
    for msg in &messages {
        let _ = conn.execute(
            "INSERT OR IGNORE INTO message_reads (message_id, session_id) VALUES (?1, ?2)",
            rusqlite::params![msg.id, q.session],
        );
    }

    Json(messages)
}

async fn unread_count(
    State(state): State<SharedState>,
    Query(q): Query<InboxQuery>,
) -> Json<CountResponse> {
    let conn = state.lock().unwrap();

    let count: u64 = conn
        .query_row(
            "SELECT COUNT(*) FROM messages m
             WHERE (m.to_session IS NULL OR m.to_session = ?1)
               AND m.from_session != ?1
               AND NOT EXISTS (
                   SELECT 1 FROM message_reads mr
                   WHERE mr.message_id = m.id AND mr.session_id = ?1
               )",
            [&q.session],
            |row| row.get(0),
        )
        .unwrap_or(0);

    Json(CountResponse { count })
}

// ── Auth helper ──

fn extract_user(
    state: &SharedState,
    headers: &HeaderMap,
) -> Result<hub::User, (StatusCode, String)> {
    let auth = headers
        .get("authorization")
        .and_then(|v| v.to_str().ok())
        .and_then(|v| v.strip_prefix("Bearer "))
        .ok_or((
            StatusCode::UNAUTHORIZED,
            "Missing Authorization header".to_string(),
        ))?;
    let conn = state.lock().unwrap();
    hub::verify_api_key(&conn, auth).ok_or((
        StatusCode::UNAUTHORIZED,
        "Invalid API key".to_string(),
    ))
}

// ── Auth request/response types ──

#[derive(Deserialize)]
struct SignupRequest {
    email: String,
    name: String,
}

#[derive(Serialize)]
struct SignupResponse {
    user: hub::User,
    api_key: String,
}

#[derive(Deserialize)]
struct LoginRequest {
    email: String,
}

#[derive(Serialize)]
struct LoginResponse {
    api_key: String,
}

// ── Auth handlers ──

async fn signup(
    State(state): State<SharedState>,
    Json(req): Json<SignupRequest>,
) -> Result<(StatusCode, Json<SignupResponse>), (StatusCode, String)> {
    let conn = state.lock().unwrap();
    let now = crate::Relay::now();
    let user_id = uuid::Uuid::new_v4().to_string();

    conn.execute(
        "INSERT INTO users (id, email, name, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![user_id, req.email, req.name, now],
    )
    .map_err(|e| {
        if e.to_string().contains("UNIQUE") {
            (
                StatusCode::CONFLICT,
                format!("Email '{}' already registered. Use /auth/login instead.", req.email),
            )
        } else {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Database error: {}", e),
            )
        }
    })?;

    let api_key = hub::generate_api_key();
    let key_hash = hub::hash_api_key(&api_key);

    conn.execute(
        "INSERT INTO api_keys (key_hash, user_id, label, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![key_hash, user_id, "default", now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to create API key: {}", e),
        )
    })?;

    let user = hub::User {
        id: user_id,
        email: req.email,
        name: req.name,
    };

    Ok((
        StatusCode::CREATED,
        Json(SignupResponse {
            user,
            api_key,
        }),
    ))
}

async fn login(
    State(state): State<SharedState>,
    Json(req): Json<LoginRequest>,
) -> Result<Json<LoginResponse>, (StatusCode, String)> {
    let conn = state.lock().unwrap();
    let now = crate::Relay::now();

    let user_id: String = conn
        .query_row(
            "SELECT id FROM users WHERE email = ?1",
            [&req.email],
            |row| row.get(0),
        )
        .map_err(|_| {
            (
                StatusCode::NOT_FOUND,
                format!("No account found for '{}'", req.email),
            )
        })?;

    let api_key = hub::generate_api_key();
    let key_hash = hub::hash_api_key(&api_key);

    conn.execute(
        "INSERT INTO api_keys (key_hash, user_id, label, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![key_hash, user_id, "default", now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to create API key: {}", e),
        )
    })?;

    Ok(Json(LoginResponse { api_key }))
}

// ── Team request/response types ──

#[derive(Deserialize)]
struct CreateTeamRequest {
    name: String,
}

#[derive(Deserialize)]
struct InviteRequest {
    email: Option<String>,
}

#[derive(Serialize)]
struct InviteResponse {
    token: String,
}

#[derive(Deserialize)]
struct JoinTeamRequest {
    token: String,
}

#[derive(Deserialize)]
struct KickRequest {
    user_id: String,
}

#[derive(Deserialize)]
struct CreateChannelRequest {
    name: String,
}

// ── Team handlers ──

async fn create_team(
    State(state): State<SharedState>,
    headers: HeaderMap,
    Json(req): Json<CreateTeamRequest>,
) -> Result<(StatusCode, Json<hub::Team>), (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();
    let now = crate::Relay::now();
    let team_id = uuid::Uuid::new_v4().to_string();

    conn.execute(
        "INSERT INTO teams (id, name, owner_id, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![team_id, req.name, user.id, now],
    )
    .map_err(|e| {
        if e.to_string().contains("UNIQUE") {
            (
                StatusCode::CONFLICT,
                format!("Team name '{}' already taken", req.name),
            )
        } else {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Database error: {}", e),
            )
        }
    })?;

    // Add creator as owner
    conn.execute(
        "INSERT INTO team_members (team_id, user_id, role, joined_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![team_id, user.id, "owner", now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to add owner: {}", e),
        )
    })?;

    // Create #general channel
    let channel_id = uuid::Uuid::new_v4().to_string();
    conn.execute(
        "INSERT INTO channels (id, team_id, name, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![channel_id, team_id, "general", now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to create #general channel: {}", e),
        )
    })?;

    let team = hub::Team {
        id: team_id,
        name: req.name,
        owner_id: user.id,
        created_at: now,
    };

    Ok((StatusCode::CREATED, Json(team)))
}

async fn list_teams(
    State(state): State<SharedState>,
    headers: HeaderMap,
) -> Result<Json<Vec<hub::Team>>, (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    let mut stmt = conn
        .prepare(
            "SELECT t.id, t.name, t.owner_id, t.created_at
             FROM teams t
             JOIN team_members tm ON tm.team_id = t.id
             WHERE tm.user_id = ?1
             ORDER BY t.created_at DESC",
        )
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?;

    let teams: Vec<hub::Team> = stmt
        .query_map([&user.id], |row| {
            Ok(hub::Team {
                id: row.get(0)?,
                name: row.get(1)?,
                owner_id: row.get(2)?,
                created_at: row.get(3)?,
            })
        })
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?
        .filter_map(|r| r.ok())
        .collect();

    Ok(Json(teams))
}

async fn create_invite(
    State(state): State<SharedState>,
    headers: HeaderMap,
    AxumPath(team_id): AxumPath<String>,
    Json(req): Json<InviteRequest>,
) -> Result<(StatusCode, Json<InviteResponse>), (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Check user is owner or admin
    let role: String = conn
        .query_row(
            "SELECT role FROM team_members WHERE team_id = ?1 AND user_id = ?2",
            rusqlite::params![team_id, user.id],
            |row| row.get(0),
        )
        .map_err(|_| {
            (
                StatusCode::FORBIDDEN,
                "You are not a member of this team".to_string(),
            )
        })?;

    if role != "owner" && role != "admin" {
        return Err((
            StatusCode::FORBIDDEN,
            "Only owners and admins can create invites".to_string(),
        ));
    }

    let now = crate::Relay::now();
    let token = format!(
        "inv_{}",
        uuid::Uuid::new_v4().to_string().replace('-', "")
    );

    conn.execute(
        "INSERT INTO invites (token, team_id, inviter_id, email, created_at) VALUES (?1, ?2, ?3, ?4, ?5)",
        rusqlite::params![token, team_id, user.id, req.email, now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to create invite: {}", e),
        )
    })?;

    Ok((StatusCode::CREATED, Json(InviteResponse { token })))
}

async fn join_team(
    State(state): State<SharedState>,
    headers: HeaderMap,
    Json(req): Json<JoinTeamRequest>,
) -> Result<Json<hub::Team>, (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Find the invite
    let (team_id, invite_email): (String, Option<String>) = conn
        .query_row(
            "SELECT team_id, email FROM invites WHERE token = ?1 AND used_at IS NULL",
            [&req.token],
            |row| Ok((row.get(0)?, row.get(1)?)),
        )
        .map_err(|_| {
            (
                StatusCode::NOT_FOUND,
                "Invalid or already used invite token".to_string(),
            )
        })?;

    // If invite is email-scoped, check it matches
    if let Some(ref email) = invite_email {
        if email != &user.email {
            return Err((
                StatusCode::FORBIDDEN,
                format!("This invite is for {}", email),
            ));
        }
    }

    let now = crate::Relay::now();

    // Check not already a member
    let already: bool = conn
        .query_row(
            "SELECT COUNT(*) FROM team_members WHERE team_id = ?1 AND user_id = ?2",
            rusqlite::params![team_id, user.id],
            |row| row.get::<_, i64>(0),
        )
        .map(|c| c > 0)
        .unwrap_or(false);

    if already {
        return Err((
            StatusCode::CONFLICT,
            "You are already a member of this team".to_string(),
        ));
    }

    // Add member
    conn.execute(
        "INSERT INTO team_members (team_id, user_id, role, joined_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![team_id, user.id, "member", now],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to join team: {}", e),
        )
    })?;

    // Mark invite as used
    let _ = conn.execute(
        "UPDATE invites SET used_at = ?1 WHERE token = ?2",
        rusqlite::params![now, req.token],
    );

    // Return team info
    let team = conn
        .query_row(
            "SELECT id, name, owner_id, created_at FROM teams WHERE id = ?1",
            [&team_id],
            |row| {
                Ok(hub::Team {
                    id: row.get(0)?,
                    name: row.get(1)?,
                    owner_id: row.get(2)?,
                    created_at: row.get(3)?,
                })
            },
        )
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Failed to fetch team: {}", e),
            )
        })?;

    Ok(Json(team))
}

async fn list_members(
    State(state): State<SharedState>,
    headers: HeaderMap,
    AxumPath(team_id): AxumPath<String>,
) -> Result<Json<Vec<hub::TeamMember>>, (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Check membership
    conn.query_row(
        "SELECT 1 FROM team_members WHERE team_id = ?1 AND user_id = ?2",
        rusqlite::params![team_id, user.id],
        |_| Ok(()),
    )
    .map_err(|_| {
        (
            StatusCode::FORBIDDEN,
            "You are not a member of this team".to_string(),
        )
    })?;

    let mut stmt = conn
        .prepare(
            "SELECT tm.user_id, tm.role, tm.joined_at, u.name, u.email
             FROM team_members tm
             JOIN users u ON u.id = tm.user_id
             WHERE tm.team_id = ?1
             ORDER BY tm.joined_at ASC",
        )
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?;

    let members: Vec<hub::TeamMember> = stmt
        .query_map([&team_id], |row| {
            Ok(hub::TeamMember {
                user_id: row.get(0)?,
                role: row.get(1)?,
                joined_at: row.get(2)?,
                name: row.get(3)?,
                email: row.get(4)?,
            })
        })
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?
        .filter_map(|r| r.ok())
        .collect();

    Ok(Json(members))
}

async fn kick_member(
    State(state): State<SharedState>,
    headers: HeaderMap,
    AxumPath(team_id): AxumPath<String>,
    Json(req): Json<KickRequest>,
) -> Result<StatusCode, (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Check caller is owner or admin
    let role: String = conn
        .query_row(
            "SELECT role FROM team_members WHERE team_id = ?1 AND user_id = ?2",
            rusqlite::params![team_id, user.id],
            |row| row.get(0),
        )
        .map_err(|_| {
            (
                StatusCode::FORBIDDEN,
                "You are not a member of this team".to_string(),
            )
        })?;

    if role != "owner" && role != "admin" {
        return Err((
            StatusCode::FORBIDDEN,
            "Only owners and admins can kick members".to_string(),
        ));
    }

    // Cannot kick yourself
    if req.user_id == user.id {
        return Err((
            StatusCode::BAD_REQUEST,
            "Cannot kick yourself".to_string(),
        ));
    }

    // Cannot kick the owner
    let target_role: String = conn
        .query_row(
            "SELECT role FROM team_members WHERE team_id = ?1 AND user_id = ?2",
            rusqlite::params![team_id, req.user_id],
            |row| row.get(0),
        )
        .map_err(|_| {
            (
                StatusCode::NOT_FOUND,
                "User is not a member of this team".to_string(),
            )
        })?;

    if target_role == "owner" {
        return Err((
            StatusCode::FORBIDDEN,
            "Cannot kick the team owner".to_string(),
        ));
    }

    conn.execute(
        "DELETE FROM team_members WHERE team_id = ?1 AND user_id = ?2",
        rusqlite::params![team_id, req.user_id],
    )
    .map_err(|e| {
        (
            StatusCode::INTERNAL_SERVER_ERROR,
            format!("Failed to kick member: {}", e),
        )
    })?;

    Ok(StatusCode::OK)
}

// ── Channel handlers ──

async fn create_channel(
    State(state): State<SharedState>,
    headers: HeaderMap,
    AxumPath(team_id): AxumPath<String>,
    Json(req): Json<CreateChannelRequest>,
) -> Result<(StatusCode, Json<hub::Channel>), (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Check membership
    conn.query_row(
        "SELECT 1 FROM team_members WHERE team_id = ?1 AND user_id = ?2",
        rusqlite::params![team_id, user.id],
        |_| Ok(()),
    )
    .map_err(|_| {
        (
            StatusCode::FORBIDDEN,
            "You are not a member of this team".to_string(),
        )
    })?;

    let now = crate::Relay::now();
    let channel_id = uuid::Uuid::new_v4().to_string();

    conn.execute(
        "INSERT INTO channels (id, team_id, name, created_at) VALUES (?1, ?2, ?3, ?4)",
        rusqlite::params![channel_id, team_id, req.name, now],
    )
    .map_err(|e| {
        if e.to_string().contains("UNIQUE") {
            (
                StatusCode::CONFLICT,
                format!("Channel '{}' already exists in this team", req.name),
            )
        } else {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Database error: {}", e),
            )
        }
    })?;

    let channel = hub::Channel {
        id: channel_id,
        name: req.name,
        team_id,
    };

    Ok((StatusCode::CREATED, Json(channel)))
}

async fn list_channels(
    State(state): State<SharedState>,
    headers: HeaderMap,
    AxumPath(team_id): AxumPath<String>,
) -> Result<Json<Vec<hub::Channel>>, (StatusCode, String)> {
    let user = extract_user(&state, &headers)?;
    let conn = state.lock().unwrap();

    // Check membership
    conn.query_row(
        "SELECT 1 FROM team_members WHERE team_id = ?1 AND user_id = ?2",
        rusqlite::params![team_id, user.id],
        |_| Ok(()),
    )
    .map_err(|_| {
        (
            StatusCode::FORBIDDEN,
            "You are not a member of this team".to_string(),
        )
    })?;

    let mut stmt = conn
        .prepare(
            "SELECT id, name, team_id FROM channels WHERE team_id = ?1 ORDER BY created_at ASC",
        )
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?;

    let channels: Vec<hub::Channel> = stmt
        .query_map([&team_id], |row| {
            Ok(hub::Channel {
                id: row.get(0)?,
                name: row.get(1)?,
                team_id: row.get(2)?,
            })
        })
        .map_err(|e| {
            (
                StatusCode::INTERNAL_SERVER_ERROR,
                format!("Query error: {}", e),
            )
        })?
        .filter_map(|r| r.ok())
        .collect();

    Ok(Json(channels))
}