Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(agents): keep unused sessions from looking recently used (#8559)
Wolf Mermelstein16a79b4fef61
diff --git a/.sqlx/query-265245f95b854dbac23d906259e3e8fb35df38a08bdf76f51d610732cf4cda10.json b/.sqlx/query-265245f95b854dbac23d906259e3e8fb35df38a08bdf76f51d610732cf4cda10.jsonnew file mode 100644index 0000000000..4f44491c0b--- /dev/null+++ b/.sqlx/query-265245f95b854dbac23d906259e3e8fb35df38a08bdf76f51d610732cf4cda10.json@@ -0,0 +1,28 @@+{+ "db_name": "PostgreSQL",+ "query": "\n UPDATE agent_session AS session\n SET manager_replica_id = NULL,\n manager_fence = manager_fence + 1,\n status = $4, status_event_name = $5, turn_state = $6\n WHERE session.id = $1\n AND session.manager_replica_id = $2 AND session.manager_fence = $3\n AND EXISTS (\n SELECT 1 FROM harness_replica AS replica\n WHERE replica.id = session.manager_replica_id\n AND replica.last_heartbeat_at <= now() - make_interval(secs => $7)\n )\n RETURNING session.id\n ",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "id",+ "type_info": "Uuid"+ }+ ],+ "parameters": {+ "Left": [+ "Uuid",+ "Uuid",+ "Int8",+ "Text",+ "Text",+ "Text",+ "Float8"+ ]+ },+ "nullable": [+ false+ ]+ },+ "hash": "265245f95b854dbac23d906259e3e8fb35df38a08bdf76f51d610732cf4cda10"+}diff --git a/.sqlx/query-be57ee32f0493054735b4c6253ab52ef9a2569133053b69b97e69e7c5e1a32a4.json b/.sqlx/query-32f055c134bee588dad2e8f1e89f356caf2f96fd7920c6878d263ab9cb485ee1.jsonsimilarity index 64%rename from .sqlx/query-be57ee32f0493054735b4c6253ab52ef9a2569133053b69b97e69e7c5e1a32a4.jsonrename to .sqlx/query-32f055c134bee588dad2e8f1e89f356caf2f96fd7920c6878d263ab9cb485ee1.jsonindex 572d984a06..68d8729eaa 100644--- a/.sqlx/query-be57ee32f0493054735b4c6253ab52ef9a2569133053b69b97e69e7c5e1a32a4.json+++ b/.sqlx/query-32f055c134bee588dad2e8f1e89f356caf2f96fd7920c6878d263ab9cb485ee1.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n UPDATE agent_session\n SET status = $2,\n status_event_name = $3,\n modified_at = now()\n WHERE id = $1\n ",+ "query": "\n UPDATE agent_session\n SET status = $2,\n status_event_name = $3\n WHERE id = $1\n ","describe": {"columns": [],"parameters": {@@ -12,5 +12,5 @@},"nullable": []},- "hash": "be57ee32f0493054735b4c6253ab52ef9a2569133053b69b97e69e7c5e1a32a4"+ "hash": "32f055c134bee588dad2e8f1e89f356caf2f96fd7920c6878d263ab9cb485ee1"}diff --git a/.sqlx/query-371919c2f02efd5c97e1e6984b71befa1b08b98324811df8690ab8cfb93b4db8.json b/.sqlx/query-371919c2f02efd5c97e1e6984b71befa1b08b98324811df8690ab8cfb93b4db8.jsondeleted file mode 100644index 735d41a923..0000000000--- a/.sqlx/query-371919c2f02efd5c97e1e6984b71befa1b08b98324811df8690ab8cfb93b4db8.json+++ /dev/null@@ -1,28 +0,0 @@-{- "db_name": "PostgreSQL",- "query": "\n UPDATE agent_session AS session\n SET manager_replica_id = NULL,\n manager_fence = manager_fence + 1,\n status = $4, status_event_name = $5, turn_state = $6,\n modified_at = now()\n WHERE session.id = $1\n AND session.manager_replica_id = $2 AND session.manager_fence = $3\n AND EXISTS (\n SELECT 1 FROM harness_replica AS replica\n WHERE replica.id = session.manager_replica_id\n AND replica.last_heartbeat_at <= now() - make_interval(secs => $7)\n )\n RETURNING session.id\n ",- "describe": {- "columns": [- {- "ordinal": 0,- "name": "id",- "type_info": "Uuid"- }- ],- "parameters": {- "Left": [- "Uuid",- "Uuid",- "Int8",- "Text",- "Text",- "Text",- "Float8"- ]- },- "nullable": [- false- ]- },- "hash": "371919c2f02efd5c97e1e6984b71befa1b08b98324811df8690ab8cfb93b4db8"-}diff --git a/.sqlx/query-6e63c4aee5b0f3ac09cfa9ffa74822979b9683912ff2e8e533ed3d500b5a470c.json b/.sqlx/query-6e63c4aee5b0f3ac09cfa9ffa74822979b9683912ff2e8e533ed3d500b5a470c.jsondeleted file mode 100644index 0287ac34b0..0000000000--- a/.sqlx/query-6e63c4aee5b0f3ac09cfa9ffa74822979b9683912ff2e8e533ed3d500b5a470c.json+++ /dev/null@@ -1,24 +0,0 @@-{- "db_name": "PostgreSQL",- "query": "\n WITH replica AS (\n INSERT INTO harness_replica (id, last_heartbeat_at)\n VALUES ($2, now())\n ON CONFLICT (id) DO UPDATE SET last_heartbeat_at = now()\n RETURNING id\n )\n UPDATE agent_session\n SET manager_replica_id = $2,\n manager_fence = manager_fence + 1,\n modified_at = now()\n FROM replica\n WHERE agent_session.id = $1 AND replica.id = $2\n AND (\n manager_replica_id IS NULL\n OR manager_replica_id = $2\n OR NOT EXISTS (\n SELECT 1 FROM harness_replica live\n WHERE live.id = agent_session.manager_replica_id\n AND live.last_heartbeat_at > now() - make_interval(secs => $3)\n AND live.draining_at IS NULL\n )\n )\n RETURNING manager_fence\n ",- "describe": {- "columns": [- {- "ordinal": 0,- "name": "manager_fence",- "type_info": "Int8"- }- ],- "parameters": {- "Left": [- "Uuid",- "Uuid",- "Float8"- ]- },- "nullable": [- false- ]- },- "hash": "6e63c4aee5b0f3ac09cfa9ffa74822979b9683912ff2e8e533ed3d500b5a470c"-}diff --git a/.sqlx/query-748bce7138e61fdc5840510f1b46c6f043da8f4cb23ffefaf61a46899d2a3a85.json b/.sqlx/query-748bce7138e61fdc5840510f1b46c6f043da8f4cb23ffefaf61a46899d2a3a85.jsonnew file mode 100644index 0000000000..65d4740c4c--- /dev/null+++ b/.sqlx/query-748bce7138e61fdc5840510f1b46c6f043da8f4cb23ffefaf61a46899d2a3a85.json@@ -0,0 +1,16 @@+{+ "db_name": "PostgreSQL",+ "query": "\n UPDATE agent_session\n SET turn_state = $2,\n modified_at = CASE WHEN $3 THEN now() ELSE modified_at END\n WHERE id = $1 AND turn_state IS DISTINCT FROM $2\n ",+ "describe": {+ "columns": [],+ "parameters": {+ "Left": [+ "Uuid",+ "Text",+ "Bool"+ ]+ },+ "nullable": []+ },+ "hash": "748bce7138e61fdc5840510f1b46c6f043da8f4cb23ffefaf61a46899d2a3a85"+}diff --git a/.sqlx/query-77db98f897600b7d69b0c2f4114e347cd2e98750c39e0fe20f1a1cda6d66721d.json b/.sqlx/query-77db98f897600b7d69b0c2f4114e347cd2e98750c39e0fe20f1a1cda6d66721d.jsonnew file mode 100644index 0000000000..e54de3952b--- /dev/null+++ b/.sqlx/query-77db98f897600b7d69b0c2f4114e347cd2e98750c39e0fe20f1a1cda6d66721d.json@@ -0,0 +1,24 @@+{+ "db_name": "PostgreSQL",+ "query": "\n WITH replica AS (\n INSERT INTO harness_replica (id, last_heartbeat_at)\n VALUES ($2, now())\n ON CONFLICT (id) DO UPDATE SET last_heartbeat_at = now()\n RETURNING id\n )\n UPDATE agent_session\n SET manager_replica_id = $2,\n manager_fence = manager_fence + 1\n FROM replica\n WHERE agent_session.id = $1 AND replica.id = $2\n AND (\n manager_replica_id IS NULL\n OR manager_replica_id = $2\n OR NOT EXISTS (\n SELECT 1 FROM harness_replica live\n WHERE live.id = agent_session.manager_replica_id\n AND live.last_heartbeat_at > now() - make_interval(secs => $3)\n AND live.draining_at IS NULL\n )\n )\n RETURNING manager_fence\n ",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "manager_fence",+ "type_info": "Int8"+ }+ ],+ "parameters": {+ "Left": [+ "Uuid",+ "Uuid",+ "Float8"+ ]+ },+ "nullable": [+ false+ ]+ },+ "hash": "77db98f897600b7d69b0c2f4114e347cd2e98750c39e0fe20f1a1cda6d66721d"+}diff --git a/.sqlx/query-96629a122c9370cdb5d5eef7a637f95c74c332f4f47d4d806b8858562905572e.json b/.sqlx/query-96629a122c9370cdb5d5eef7a637f95c74c332f4f47d4d806b8858562905572e.jsondeleted file mode 100644index 9c2a22de07..0000000000--- a/.sqlx/query-96629a122c9370cdb5d5eef7a637f95c74c332f4f47d4d806b8858562905572e.json+++ /dev/null@@ -1,15 +0,0 @@-{- "db_name": "PostgreSQL",- "query": "\n UPDATE agent_session\n SET turn_state = $2\n WHERE id = $1 AND turn_state IS DISTINCT FROM $2\n ",- "describe": {- "columns": [],- "parameters": {- "Left": [- "Uuid",- "Text"- ]- },- "nullable": []- },- "hash": "96629a122c9370cdb5d5eef7a637f95c74c332f4f47d4d806b8858562905572e"-}diff --git a/.sqlx/query-0814e8e524456020fd891140956e8622293a0b216e3fe4cd7068f2ff58d47eaf.json b/.sqlx/query-e43bef5780d459f55a4e668b2f25d138cfd36e145af905f2f24204ba6a3d5aa0.jsonsimilarity index 57%rename from .sqlx/query-0814e8e524456020fd891140956e8622293a0b216e3fe4cd7068f2ff58d47eaf.jsonrename to .sqlx/query-e43bef5780d459f55a4e668b2f25d138cfd36e145af905f2f24204ba6a3d5aa0.jsonindex 20505e6e28..1ffbe4e891 100644--- a/.sqlx/query-0814e8e524456020fd891140956e8622293a0b216e3fe4cd7068f2ff58d47eaf.json+++ b/.sqlx/query-e43bef5780d459f55a4e668b2f25d138cfd36e145af905f2f24204ba6a3d5aa0.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n UPDATE agent_session\n SET acp_session_id = $2,\n modified_at = NOW()\n WHERE id = $1\n ",+ "query": "\n UPDATE agent_session\n SET acp_session_id = $2\n WHERE id = $1\n ","describe": {"columns": [],"parameters": {@@ -11,5 +11,5 @@},"nullable": []},- "hash": "0814e8e524456020fd891140956e8622293a0b216e3fe4cd7068f2ff58d47eaf"+ "hash": "e43bef5780d459f55a4e668b2f25d138cfd36e145af905f2f24204ba6a3d5aa0"}diff --git a/.sqlx/query-521b591873e9fdbaa3310380723aafad9da0742692aec0122c5c922804c5f795.json b/.sqlx/query-f1a226ad1131f5b0684e9252cb6fe31623fb023cd46f1b7297bb55c3e5e463eb.jsonsimilarity index 51%rename from .sqlx/query-521b591873e9fdbaa3310380723aafad9da0742692aec0122c5c922804c5f795.jsonrename to .sqlx/query-f1a226ad1131f5b0684e9252cb6fe31623fb023cd46f1b7297bb55c3e5e463eb.jsonindex 3e2d2c8469..b5aa06f3da 100644--- a/.sqlx/query-521b591873e9fdbaa3310380723aafad9da0742692aec0122c5c922804c5f795.json+++ b/.sqlx/query-f1a226ad1131f5b0684e9252cb6fe31623fb023cd46f1b7297bb55c3e5e463eb.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n UPDATE agent_session\n SET manager_replica_id = NULL,\n modified_at = now()\n WHERE id = $1 AND manager_replica_id = $2 AND manager_fence = $3\n ",+ "query": "\n UPDATE agent_session\n SET manager_replica_id = NULL\n WHERE id = $1 AND manager_replica_id = $2 AND manager_fence = $3\n ","describe": {"columns": [],"parameters": {@@ -12,5 +12,5 @@},"nullable": []},- "hash": "521b591873e9fdbaa3310380723aafad9da0742692aec0122c5c922804c5f795"+ "hash": "f1a226ad1131f5b0684e9252cb6fe31623fb023cd46f1b7297bb55c3e5e463eb"}diff --git a/apps/web/src/features/agents-view/core/recent-conversations.ts b/apps/web/src/features/agents-view/core/recent-conversations.tsindex f95f68d973..5f3349e162 100644--- a/apps/web/src/features/agents-view/core/recent-conversations.ts+++ b/apps/web/src/features/agents-view/core/recent-conversations.ts@@ -29,7 +29,7 @@ function isAgentConversation(return entity.type === 'agent_session' || entity.type === 'chat';}-/** When a conversation last moved, as epoch millis; 0 when unknown. */+/** When a conversation last had user-visible work, as epoch millis; 0 when unknown. */export function conversationTimestamp(entity: Pick<AgentConversationEntity, 'updatedAt' | 'createdAt'>): number {diff --git a/crates/agent_session/AGENTS.md b/crates/agent_session/AGENTS.mdindex 8209255275..9cf9758432 100644--- a/crates/agent_session/AGENTS.md+++ b/crates/agent_session/AGENTS.md@@ -87,6 +87,10 @@ persisted prompter, never from an old wire actor or a newer user turn.- The row's fenced log writer and the Cursor projection both lock thesession row `FOR UPDATE`; never add a second `NOWAIT` locker withoutchecking both paths (see git history on `src/domain/control.rs`).+- `modified_at` is Agents/Home list recency. Bump it for user-visible work+ (`moves_session_list`: starting/running/stopping/blocked) and metadata+ the viewer asked to change. Do not bump it for claim, release, recovery,+ ACP session id, or system events (`acp_ready`, `disconnected`).## Relateddiff --git a/crates/agent_session/src/domain/ports.rs b/crates/agent_session/src/domain/ports.rsindex 0753fbf5e6..b91d02adac 100644--- a/crates/agent_session/src/domain/ports.rs+++ b/crates/agent_session/src/domain/ports.rs@@ -487,7 +487,8 @@ pub trait AgentSessionRepo: Send + Sync + 'static {/// stop rendering because its agent was removed.fn session_bot(&self, id: BotId) -> impl Future<Output = Result<SessionBot>> + Send;- /// Persist the agent-assigned ACP session id without replacing other session fields.+ /// Persist the agent-assigned ACP session id without replacing other+ /// session fields or reordering the session list.fn set_acp_session_id(&self,id: AgentSessionId,@@ -642,9 +643,11 @@ pub const REPLICA_STALE_AFTER: std::time::Duration = std::time::Duration::from_s/// Claiming is a single conditional update (compare-and-swap): it succeeds/// when the session is unmanaged, already ours, or held by a replica whose/// heartbeat has gone stale, and every success increments the session's-/// fence. There are deliberately no explicit locks anywhere in the contract --/// see [`ManagerFence`](super::model::ManagerFence) for why a fence, not a-/// lock, is what neutralizes a stale holder.+/// fence. Lease changes must not bump list recency: a reclaim, release, or+/// stale takeover is not the conversation being used. There are deliberately+/// no explicit locks anywhere in the contract - see+/// [`ManagerFence`](super::model::ManagerFence) for why a fence, not a lock,+/// is what neutralizes a stale holder.pub trait SessionOwnership: Send + Sync + 'static {/// Claim live management of a session for `replica`, registering the/// replica's heartbeat as a side effect so a claim can never dangle on adiff --git a/crates/agent_session/src/domain/recovery.rs b/crates/agent_session/src/domain/recovery.rsindex 6d3630fdf5..9b47f62e17 100644--- a/crates/agent_session/src/domain/recovery.rs+++ b/crates/agent_session/src/domain/recovery.rs@@ -19,6 +19,7 @@ pub trait StaleSessionRepo: Send + Sync {/// the claim, append `Disconnected`, and project its turn state. Return/// `None` if a heartbeat, takeover, release, or another recovery won./// Revocation increments the fence so the old actor can never append again.+ /// Closing an abandoned runtime must not reorder the session list.fn disconnect_stale_claim(&self,claim: SessionClaim,diff --git a/crates/agent_session/src/domain/turn_state.rs b/crates/agent_session/src/domain/turn_state.rsindex 9b05e1410f..1a10c0a16d 100644--- a/crates/agent_session/src/domain/turn_state.rs+++ b/crates/agent_session/src/domain/turn_state.rs@@ -10,6 +10,16 @@ use super::error::Result;use super::model::AgentSessionId;use super::ports::AgentSessionLogRepo;+/// Whether this turn is user-visible work that should move the session in+/// Agents and Home lists. Connection lifecycle (`idle` after reconnect,+/// `disconnected`) must not look like the conversation was used.+pub fn moves_session_list(turn: TurnState) -> bool {+ matches!(+ turn,+ TurnState::Starting | TurnState::Running | TurnState::Stopping | TurnState::Blocked+ )+}+/// The persistence operations needed by a bounded projection backfill.pub trait SessionTurnProjectionRepo {/// At most `limit` sessions that have never had their activity projected.diff --git a/crates/agent_session/src/domain/turn_state/test.rs b/crates/agent_session/src/domain/turn_state/test.rsindex 29301d9ecf..4d9f32c114 100644--- a/crates/agent_session/src/domain/turn_state/test.rs+++ b/crates/agent_session/src/domain/turn_state/test.rs@@ -3,6 +3,16 @@ use crate::domain::ports::AgentSessionLogRepo;use crate::testing::{InMemoryAgentSessionRepo, test_agent_session};use agent_fold::testing::{TURN, parse_log_as, test_session};+#[test]+fn only_open_work_moves_the_session_list() {+ assert!(moves_session_list(TurnState::Starting));+ assert!(moves_session_list(TurnState::Running));+ assert!(moves_session_list(TurnState::Stopping));+ assert!(moves_session_list(TurnState::Blocked));+ assert!(!moves_session_list(TurnState::Idle));+ assert!(!moves_session_list(TurnState::Disconnected));+}+#[tokio::test]async fn backfill_is_bounded_and_uses_the_authoritative_fold() {let repo = InMemoryAgentSessionRepo::new();diff --git a/crates/agent_session/src/outbound/postgres.rs b/crates/agent_session/src/outbound/postgres.rsindex b7f92f8d0a..7725c23df3 100644--- a/crates/agent_session/src/outbound/postgres.rs+++ b/crates/agent_session/src/outbound/postgres.rs@@ -32,6 +32,7 @@ use crate::domain::ports::{SessionOwnership,};use crate::domain::sharing::{SessionBotOwnership, originating_channel_access};+use crate::domain::turn_state::moves_session_list;use crate::outbound::connection_gateway_realtime::SessionAudience;use agent_client_protocol::schema::v1::SessionId;use agent_runtime_protocol::domain::schema::v0::{SystemEvent, ToRuntimeMessage, ToServerMessage};@@ -800,8 +801,7 @@ impl<B: BotFacts + 'static> AgentSessionRepo for PgAgentSessionRepo<B> {let result = sqlx::query!(r#"UPDATE agent_session- SET acp_session_id = $2,- modified_at = NOW()+ SET acp_session_id = $2WHERE id = $1"#,id.as_uuid(),@@ -1586,8 +1586,7 @@ impl<B: BotFacts + 'static> AgentSessionLogRepo for PgAgentSessionRepo<B> {r#"UPDATE agent_sessionSET status = $2,- status_event_name = $3,- modified_at = now()+ status_event_name = $3WHERE id = $1"#,log.agent_session_id.as_uuid(),@@ -1603,11 +1602,13 @@ impl<B: BotFacts + 'static> AgentSessionLogRepo for PgAgentSessionRepo<B> {sqlx::query!(r#"UPDATE agent_session- SET turn_state = $2+ SET turn_state = $2,+ modified_at = CASE WHEN $3 THEN now() ELSE modified_at ENDWHERE id = $1 AND turn_state IS DISTINCT FROM $2"#,log.agent_session_id.as_uuid(),turn_state.as_ref(),+ moves_session_list(turn_state),).execute(&mut *transaction).await@@ -1744,8 +1745,7 @@ impl<B: BotFacts + 'static> SessionOwnership for PgAgentSessionRepo<B> {)UPDATE agent_sessionSET manager_replica_id = $2,- manager_fence = manager_fence + 1,- modified_at = now()+ manager_fence = manager_fence + 1FROM replicaWHERE agent_session.id = $1 AND replica.id = $2AND (@@ -1801,8 +1801,7 @@ impl<B: BotFacts + 'static> SessionOwnership for PgAgentSessionRepo<B> {sqlx::query!(r#"UPDATE agent_session- SET manager_replica_id = NULL,- modified_at = now()+ SET manager_replica_id = NULLWHERE id = $1 AND manager_replica_id = $2 AND manager_fence = $3"#,claim.session.as_uuid(),diff --git a/crates/agent_session/src/outbound/postgres/recovery.rs b/crates/agent_session/src/outbound/postgres/recovery.rsindex 6f2ebe3089..2e6194d406 100644--- a/crates/agent_session/src/outbound/postgres/recovery.rs+++ b/crates/agent_session/src/outbound/postgres/recovery.rs@@ -68,8 +68,7 @@ impl<B: BotFacts + 'static> StaleSessionRepo for PgAgentSessionRepo<B> {UPDATE agent_session AS sessionSET manager_replica_id = NULL,manager_fence = manager_fence + 1,- status = $4, status_event_name = $5, turn_state = $6,- modified_at = now()+ status = $4, status_event_name = $5, turn_state = $6WHERE session.id = $1AND session.manager_replica_id = $2 AND session.manager_fence = $3AND EXISTS (diff --git a/crates/agent_session/src/outbound/postgres/test.rs b/crates/agent_session/src/outbound/postgres/test.rsindex 49304b41ca..b387e97934 100644--- a/crates/agent_session/src/outbound/postgres/test.rs+++ b/crates/agent_session/src/outbound/postgres/test.rs@@ -1,4 +1,5 @@use super::*;+mod list_activity;mod queue;mod recovery;mod search;diff --git a/crates/agent_session/src/outbound/postgres/test/list_activity.rs b/crates/agent_session/src/outbound/postgres/test/list_activity.rsnew file mode 100644index 0000000000..6eefd303cc--- /dev/null+++ b/crates/agent_session/src/outbound/postgres/test/list_activity.rs@@ -0,0 +1,110 @@+use super::*;+use crate::domain::ports::SessionOwnership;+use crate::domain::recovery::StaleSessionRepo;+use agent_fold::domain::model::TurnState;+use chrono::{DateTime, Utc};++async fn modified_at(pool: &PgPool, id: AgentSessionId) -> DateTime<Utc> {+ sqlx::query_scalar!(+ "SELECT modified_at FROM agent_session WHERE id = $1",+ id.as_uuid()+ )+ .fetch_one(pool)+ .await+ .expect("read modified_at")+}++async fn age_list_timestamp(pool: &PgPool, id: AgentSessionId) -> DateTime<Utc> {+ sqlx::query_scalar!(+ "UPDATE agent_session SET modified_at = NOW() - INTERVAL '1 hour' WHERE id = $1 RETURNING modified_at",+ id.as_uuid()+ )+ .fetch_one(pool)+ .await+ .expect("age modified_at")+}++/// Unused sessions were showing "2m" because claim, release, recovery, and+/// connection events all stamped `modified_at`. Only open turn work should.+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn lease_and_connection_lifecycle_do_not_reorder_the_session_list(pool: PgPool) {+ let repo = test_repo(&pool);+ let bot_id = create_test_bot(&pool).await;+ let session = create_session(&repo, new_session(bot_id, None, None)).await;+ let aged = age_list_timestamp(&pool, session.id).await;+ let replica = ReplicaId::mint();++ claimed(repo.claim(session.id, replica).await.expect("claim"));+ assert_eq!(modified_at(&pool, session.id).await, aged);++ let claim = claimed(+ repo.claim(session.id, replica)+ .await+ .expect("reclaim the same replica"),+ );+ assert_eq!(modified_at(&pool, session.id).await, aged);++ repo.release(&claim).await.expect("release");+ assert_eq!(modified_at(&pool, session.id).await, aged);++ append_system_event(&repo, session.id, SystemEvent::AcpReady).await;+ assert_eq!(modified_at(&pool, session.id).await, aged);++ repo.set_acp_session_id(session.id, SessionId::from("acp-session-1"))+ .await+ .expect("persist ACP session id");+ assert_eq!(modified_at(&pool, session.id).await, aged);++ append_system_event(&repo, session.id, SystemEvent::Disconnected).await;+ assert_eq!(modified_at(&pool, session.id).await, aged);+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn open_turn_work_moves_the_session_list_and_disconnect_does_not(pool: PgPool) {+ let repo = test_repo(&pool);+ let bot_id = create_test_bot(&pool).await;+ let session = create_session(&repo, new_session(bot_id, None, None)).await;+ let replica = ReplicaId::mint();+ let claim = claimed(repo.claim(session.id, replica).await.expect("claim"));+ let aged = age_list_timestamp(&pool, session.id).await;++ repo.create_projected(+ fenced_log(session.id),+ Some(&claim),+ None,+ Some(TurnState::Running),+ )+ .await+ .expect("project running turn");+ let after_work = modified_at(&pool, session.id).await;+ assert!(after_work > aged);++ repo.create_projected(+ fenced_log(session.id),+ Some(&claim),+ None,+ Some(TurnState::Disconnected),+ )+ .await+ .expect("project disconnect");+ assert_eq!(modified_at(&pool, session.id).await, after_work);+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn stale_recovery_does_not_reorder_the_session_list(pool: PgPool) {+ let repo = test_repo(&pool);+ let bot_id = create_test_bot(&pool).await;+ let session = create_session(&repo, new_session(bot_id, None, None)).await;+ let replica = ReplicaId::mint();+ let claim = claimed(repo.claim(session.id, replica).await.expect("claim"));+ let aged = age_list_timestamp(&pool, session.id).await;+ let_heartbeat_go_stale(&pool, replica).await;++ assert!(+ repo.disconnect_stale_claim(claim)+ .await+ .expect("recover")+ .is_some()+ );+ assert_eq!(modified_at(&pool, session.id).await, aged);+}