Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(agent_session): select external identity in find_all_for_thread (#5943)

teobfa28261fb00
diff --git a/.sqlx/query-1b9d5291cf17cb33b9ba0843863f59ff3cf2e1473c89880a5a21d32f881ebc54.json b/.sqlx/query-f99b8550fdb6c82da89f3b8a66142290daab84ae3b10f784825276a9f2ff6317.json
similarity index 65%
rename from .sqlx/query-1b9d5291cf17cb33b9ba0843863f59ff3cf2e1473c89880a5a21d32f881ebc54.json
rename to .sqlx/query-f99b8550fdb6c82da89f3b8a66142290daab84ae3b10f784825276a9f2ff6317.json
index 3a1bc98dc3..a7389b6b32 100644
--- a/.sqlx/query-1b9d5291cf17cb33b9ba0843863f59ff3cf2e1473c89880a5a21d32f881ebc54.json
+++ b/.sqlx/query-f99b8550fdb6c82da89f3b8a66142290daab84ae3b10f784825276a9f2ff6317.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n id, name, owner_id, thread_id, originating_message_id, bot_id,\n model, harness, repo_url, workspace, sandbox_size, acp_session_id, status,\n status_event_name, created_at, modified_at,\n (SELECT channel_id FROM comms_messages WHERE id = agent_session.thread_id)\n AS \"thread_channel_id?\"\n FROM agent_session\n WHERE thread_id = $1\n ORDER BY created_at DESC\n ",
+ "query": "\n SELECT\n id, name, owner_id, thread_id, originating_message_id, bot_id,\n model, harness, repo_url, workspace, sandbox_size, acp_session_id, status,\n status_event_name, agent_session.created_at, modified_at,\n (SELECT channel_id FROM comms_messages WHERE id = agent_session.thread_id)\n AS \"thread_channel_id?\",\n ext.provider AS \"external_provider?\", ext.external_id AS \"external_id?\",\n ext.external_name AS \"external_name?\", ext.external_url AS \"external_url?\"\n FROM agent_session\n LEFT JOIN external_agent_session AS ext ON ext.agent_session_id = agent_session.id\n WHERE thread_id = $1\n ORDER BY agent_session.created_at DESC\n ",
"describe": {
"columns": [
{
@@ -87,6 +87,26 @@
"ordinal": 16,
"name": "thread_channel_id?",
"type_info": "Uuid"
+ },
+ {
+ "ordinal": 17,
+ "name": "external_provider?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 18,
+ "name": "external_id?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 19,
+ "name": "external_name?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 20,
+ "name": "external_url?",
+ "type_info": "Text"
}
],
"parameters": {
@@ -111,8 +131,12 @@
true,
false,
false,
- null
+ null,
+ false,
+ false,
+ true,
+ true
]
},
- "hash": "1b9d5291cf17cb33b9ba0843863f59ff3cf2e1473c89880a5a21d32f881ebc54"
+ "hash": "f99b8550fdb6c82da89f3b8a66142290daab84ae3b10f784825276a9f2ff6317"
}
diff --git a/crates/agent_harness/src/inbound/kafka/test.rs b/crates/agent_harness/src/inbound/kafka/test.rs
index 74d48df9bb..83523c3948 100644
--- a/crates/agent_harness/src/inbound/kafka/test.rs
+++ b/crates/agent_harness/src/inbound/kafka/test.rs
@@ -197,6 +197,7 @@ fn channel_message_from(bot: BotId, sender: ChannelSender<'static>) -> AgentTrig
AgentTriggerTopicEvent::Existing(ExistingAgentSessionEvent::Channel(ChannelEventMetadata {
bot_id: bot,
session_id: AgentSessionId::TEST_A,
+ kind: ChannelKind::MentionThread,
message: message(sender),
}))
}
diff --git a/crates/agent_harness/src/outbound/cursor/manager/test.rs b/crates/agent_harness/src/outbound/cursor/manager/test.rs
index 9f9c9ef81b..8a16818e8e 100644
--- a/crates/agent_harness/src/outbound/cursor/manager/test.rs
+++ b/crates/agent_harness/src/outbound/cursor/manager/test.rs
@@ -88,6 +88,13 @@ impl AgentSessionRepo for StubSessions {
unimplemented!("the manager never routes channel events")
}
+ async fn find_all_for_thread(
+ &self,
+ _thread_id: macro_uuid::Uuid,
+ ) -> SessionResult<Vec<AgentSession>> {
+ unimplemented!("the manager never lists thread sessions")
+ }
+
async fn session_bot(&self, _id: BotId) -> SessionResult<SessionBot> {
unimplemented!("the manager never renders bots")
}
diff --git a/crates/agent_harness/src/outbound/routing/test.rs b/crates/agent_harness/src/outbound/routing/test.rs
index a935addaa8..e406958d44 100644
--- a/crates/agent_harness/src/outbound/routing/test.rs
+++ b/crates/agent_harness/src/outbound/routing/test.rs
@@ -119,6 +119,13 @@ impl AgentSessionRepo for FixedBotSessions {
unimplemented!("the router never routes channel events")
}
+ async fn find_all_for_thread(
+ &self,
+ _thread_id: macro_uuid::Uuid,
+ ) -> SessionResult<Vec<AgentSession>> {
+ unimplemented!("the router never lists thread sessions")
+ }
+
async fn session_bot(&self, _id: BotId) -> SessionResult<SessionBot> {
unimplemented!("the router never renders bots")
}
diff --git a/crates/agent_session/src/outbound/postgres.rs b/crates/agent_session/src/outbound/postgres.rs
index 3bb922e086..10014a1fbf 100644
--- a/crates/agent_session/src/outbound/postgres.rs
+++ b/crates/agent_session/src/outbound/postgres.rs
@@ -345,12 +345,15 @@ impl AgentSessionRepo for PgAgentSessionRepo {
SELECT
id, name, owner_id, thread_id, originating_message_id, bot_id,
model, harness, repo_url, workspace, sandbox_size, acp_session_id, status,
- status_event_name, created_at, modified_at,
+ status_event_name, agent_session.created_at, modified_at,
(SELECT channel_id FROM comms_messages WHERE id = agent_session.thread_id)
- AS "thread_channel_id?"
+ AS "thread_channel_id?",
+ ext.provider AS "external_provider?", ext.external_id AS "external_id?",
+ ext.external_name AS "external_name?", ext.external_url AS "external_url?"
FROM agent_session
+ LEFT JOIN external_agent_session AS ext ON ext.agent_session_id = agent_session.id
WHERE thread_id = $1
- ORDER BY created_at DESC
+ ORDER BY agent_session.created_at DESC
"#,
thread_id,
)
diff --git a/crates/agent_session/src/outbound/postgres/test.rs b/crates/agent_session/src/outbound/postgres/test.rs
index 5553c618f5..cdca706523 100644
--- a/crates/agent_session/src/outbound/postgres/test.rs
+++ b/crates/agent_session/src/outbound/postgres/test.rs
@@ -505,6 +505,60 @@ async fn find_for_channel_matches_the_originating_thread_and_bot(pool: PgPool) {
assert!(matches!(wrong_thread, ChannelSession::None));
}
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn find_all_for_thread_returns_every_session_on_the_thread(pool: PgPool) {
+ let repo = PgAgentSessionRepo::new(pool.clone());
+ let bot_a = create_test_bot(&pool).await;
+ let bot_b = create_test_bot(&pool).await;
+ let (_channel, thread, originating_message) = insert_originating_thread_fixture(&pool).await;
+ let older = create_session(
+ &repo,
+ new_session(bot_a, Some(thread), Some(originating_message)),
+ )
+ .await;
+ let newer = create_session(
+ &repo,
+ new_session(bot_b, Some(thread), Some(originating_message)),
+ )
+ .await;
+ create_session(&repo, new_session(bot_a, None, None)).await;
+ ExternalSessionRepo::upsert(&repo, newer.id, cursor_external("bc-thread"))
+ .await
+ .expect("attach an external identity");
+
+ let found = repo
+ .find_all_for_thread(thread)
+ .await
+ .expect("list sessions on the thread");
+ assert_eq!(found.len(), 2);
+ assert!(found.iter().any(|session| session.id == newer.id));
+ assert!(found.iter().any(|session| session.id == older.id));
+ assert!(
+ found
+ .windows(2)
+ .all(|pair| pair[0].created_at >= pair[1].created_at)
+ );
+ let with_external = found
+ .iter()
+ .find(|session| session.id == newer.id)
+ .expect("the newer session is on the thread");
+ assert_eq!(with_external.external, Some(cursor_external("bc-thread")));
+ assert!(
+ found
+ .iter()
+ .find(|session| session.id == older.id)
+ .expect("the older session is on the thread")
+ .external
+ .is_none()
+ );
+
+ let empty = repo
+ .find_all_for_thread(macro_uuid::generate_uuid_v7())
+ .await
+ .expect("list an unrelated thread");
+ assert!(empty.is_empty());
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn find_for_channel_requires_thread_and_bot_for_originating_match(pool: PgPool) {
let repo = PgAgentSessionRepo::new(pool.clone());