feat: add retention policy for agent chats by 0vertake · Pull Request #4039 · superplanehq/superplane

0vertake · 2026-04-08T13:04:08Z

Summary

Hourly background task in the agent service deletes expired chats per organization, using each org's retention_window_days from the usage service
Falls back to AGENT_CHAT_RETENTION_DAYS env var (default 14) when the usage service is unavailable or returns no policy for an org
Setting AGENT_CHAT_RETENTION_DAYS=0 disables the fallback but still respects per-org policies from the usage service
Deletes are batched (500 rows per transaction) with a race-safe outer WHERE clause for READ COMMITTED isolation
Adds composite index on (org_id, updated_at) for efficient per-org cleanup queries
Fixes missing await on UsageLimitChecker.close()

superplanehq-integration · 2026-04-08T13:04:21Z

👋 Commands for maintainers:

/sp start - Start an ephemeral machine (takes ~30s)
/sp stop - Stop a running machine (auto-executed on pr close)

lucaspin · 2026-04-10T23:33:54Z

@0vertake now that the agent service is talking with the usage service, I think the retention policy configuration should be based on the limit for retention policy for the organization. @forestileao can you help here?

forestileao · 2026-04-11T00:40:19Z

@0vertake now that the agent service is talking with the usage service, I think the retention policy configuration should be based on the limit for retention policy for the organization. @forestileao can you help here?

I will need to add a retention policy limit to agent chats on usage service. Then he will only need to grab this value to cleanup stuff.

lucaspin · 2026-04-11T01:31:58Z

@forestileao can't we just use the same retention policy we have there for everything else already?

forestileao · 2026-04-11T03:54:53Z

@forestileao can't we just use the same retention policy we have there for everything else already?

We can, no problem. Unless we want to make different policies, but I don't think we need

Remove agent chats from the database based on each organization's retention window from the usage service, falling back to a configurable default (AGENT_CHAT_RETENTION_DAYS, default 14 days, 0 to disable). - Add per-org delete_expired_chats_for_org to SessionStore with batched DELETEs and a race-safe outer WHERE clause for READ COMMITTED isolation - Query each org's retention_window_days via the usage service gRPC; fall back to the env var default when the service is unavailable - Add background async task (chat_retention.py) wired into the FastAPI lifespan, checking once per hour - Add updated_at index on agent_chats for query performance - Fix missing await on UsageLimitChecker.close() - Add unit tests for the store method and the retention loop Closes superplanehq#3818 Signed-off-by: Milos Jovanovic <milosjovanovic519@gmail.com> Made-with: Cursor

Signed-off-by: Milos Jovanovic <milosjovanovic519@gmail.com>

cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 2feebfb. Configure here.}

Signed-off-by: Milos Jovanovic <milosjovanovic519@gmail.com>

superplane-policy-bot bot requested a review from shiroyasha April 8, 2026 13:04

0vertake requested a review from lucaspin April 8, 2026 13:07

cursor bot reviewed Apr 8, 2026

View reviewed changes

Comment thread agent/tests/test_session_store.py Outdated

cursor bot reviewed Apr 9, 2026

View reviewed changes

Comment thread agent/src/ai/session_store.py Outdated

cursor bot reviewed Apr 9, 2026

View reviewed changes

Comment thread agent/db/structure.sql Outdated

cursor bot reviewed Apr 9, 2026

View reviewed changes

Comment thread agent/src/ai/session_store.py Outdated

superplane-policy-bot bot requested a review from forestileao April 13, 2026 13:02