Skip to content

Agent Zero AI framework

Fix Office session cleanup race

Alessandro24812aabbb3e
diff --git a/plugins/_office/helpers/wopi_store.py b/plugins/_office/helpers/wopi_store.py
index 471fd9aa4..4514cf5ca 100644
--- a/plugins/_office/helpers/wopi_store.py
+++ b/plugins/_office/helpers/wopi_store.py
@@ -25,6 +25,7 @@ PLUGIN_NAME = "_office"
SUPPORTED_EXTENSIONS = {"docx", "xlsx", "pptx", "odt", "ods", "odp"}
DEFAULT_TTL_SECONDS = 8 * 60 * 60
DEFAULT_LOCK_SECONDS = 30 * 60
+ORPHAN_SESSION_GRACE_SECONDS = 30
MAX_LOCK_SECONDS = 3600
MIN_LOCK_SECONDS = 60
MAX_SAVE_BYTES = 512 * 1024 * 1024
@@ -289,20 +290,24 @@ def sync_open_sessions(active_session_ids: list[str] | tuple[str, ...] | set[str
active_ids = {str(session_id).strip() for session_id in active_session_ids if str(session_id).strip()}
with connect() as conn:
_clear_expired_sessions(conn)
+ cutoff = now() - ORPHAN_SESSION_GRACE_SECONDS
if active_ids:
placeholders = ",".join("?" for _ in active_ids)
rows = conn.execute(
- f"SELECT session_id, file_id FROM sessions WHERE session_id NOT IN ({placeholders})",
- tuple(active_ids),
+ f"SELECT session_id, file_id FROM sessions WHERE session_id NOT IN ({placeholders}) AND created_at < ?",
+ (*tuple(active_ids), cutoff),
).fetchall()
- conn.execute(f"DELETE FROM tokens WHERE session_id NOT IN ({placeholders})", tuple(active_ids))
- conn.execute(f"DELETE FROM sessions WHERE session_id NOT IN ({placeholders})", tuple(active_ids))
- conn.execute(f"DELETE FROM locks WHERE session_id NOT IN ({placeholders})", tuple(active_ids))
else:
- rows = conn.execute("SELECT session_id, file_id FROM sessions").fetchall()
- conn.execute("DELETE FROM tokens")
- conn.execute("DELETE FROM sessions")
- conn.execute("DELETE FROM locks")
+ rows = conn.execute("SELECT session_id, file_id FROM sessions WHERE created_at < ?", (cutoff,)).fetchall()
+
+ if not rows:
+ return 0
+
+ session_ids = tuple(row["session_id"] for row in rows)
+ placeholders = ",".join("?" for _ in session_ids)
+ conn.execute(f"DELETE FROM tokens WHERE session_id IN ({placeholders})", session_ids)
+ conn.execute(f"DELETE FROM sessions WHERE session_id IN ({placeholders})", session_ids)
+ conn.execute(f"DELETE FROM locks WHERE session_id IN ({placeholders})", session_ids)
for row in rows:
conn.execute(
diff --git a/tests/test_office_wopi_store.py b/tests/test_office_wopi_store.py
index 682cd44ff..48b6c5ebd 100644
--- a/tests/test_office_wopi_store.py
+++ b/tests/test_office_wopi_store.py
@@ -113,6 +113,11 @@ def test_sync_open_sessions_closes_sessions_without_visible_tabs(office_state):
orphan = wopi_store.create_session(second["file_id"], "user-a", "write", "http://localhost:32080")
ok, _ = wopi_store.lock(second["file_id"], "orphan-lock", orphan["session_id"], 120)
assert ok is True
+ with wopi_store.connect() as conn:
+ conn.execute(
+ "UPDATE sessions SET created_at = ? WHERE session_id = ?",
+ (wopi_store.now() - wopi_store.ORPHAN_SESSION_GRACE_SECONDS - 1, orphan["session_id"]),
+ )
assert wopi_store.sync_open_sessions([visible["session_id"]]) == 1
@@ -124,6 +129,16 @@ def test_sync_open_sessions_closes_sessions_without_visible_tabs(office_state):
wopi_store.validate_token(orphan["access_token"], second["file_id"])
+def test_sync_open_sessions_preserves_new_sessions_during_mount_race(office_state):
+ doc = wopi_store.create_document("document", "Fresh", "docx", "new")
+ session = wopi_store.create_session(doc["file_id"], "user-a", "write", "http://localhost:32080")
+
+ assert wopi_store.sync_open_sessions([]) == 0
+
+ token_info = wopi_store.validate_token(session["access_token"], doc["file_id"], require_write=True)
+ assert token_info["session"]["session_id"] == session["session_id"]
+
+
def test_recent_documents_include_lightweight_previews(office_state):
doc = wopi_store.create_document("document", "Preview Memo", "docx", "A calm dashboard.")
sheet = wopi_store.create_document("spreadsheet", "Preview Sheet", "xlsx", "Name,Value\nOffice,1")