hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-10 06:33:18 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(scheduler): reuse one execution session per scheduled job

Browse source 
Reuse channel_session_v2 per job_id so cron runs do not create a new
oclaw session each time; isolate scheduled turn context to the active
turn_uuid so shared sessions do not leak prior run history.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-07-21 16:20:31 +08:00
parent 146d83c336
commit 4f36f4a36f
4 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
runtime/scheduler/session_resolver.py
View file

@ -51,24 +51,28 @@ def _ensure_administrator_owner(store: Any, *, tenant_id: str) -> dict[str, Any]
}
def _create_scheduled_execution_session(
def _get_or_create_scheduled_execution_session(
store: Any,
*,
tenant_id: str,
user_id: str,
job_id: str,
job_name: str,
run_id: str = "",
) -> str:
rid = str(run_id or "").strip()
"""One execution session per scheduled job (not per run); visible for ops cleanup."""
title = f"Scheduled · {job_name}"
if rid:
title = f"{title} · {rid[:8]}"
jid = str(job_id or "").strip()
tid = str(tenant_id or "").strip()
uid = str(user_id or "").strip()
if uid and tid:
sess = store.create_session_for_user(title=title, tenant_id=tid, user_id=uid)
else:
sess = store.create_session(title)
getter = getattr(store, "get_or_create_channel_session_v2", None)
if jid and tid and callable(getter):
return getter(
tenant_id=tid,
channel="scheduled_job",
account_id="job",
external_chat_id=jid,
external_user_id=jid,
session_title=title,
)
sess = store.create_session(title)
return str(sess.id)
@ -255,9 +259,9 @@ def resolve_scheduled_session(
*,
job: Any,
created_by_user_id: str = "",
run_id: str = "",
) -> ResolvedSession:
job_name = str(getattr(job, "name", "") or "Scheduled task")
job_id = str(getattr(job, "id", "") or "").strip()
(
tenant_id,
user_id,
@ -272,12 +276,11 @@ def resolve_scheduled_session(
job=job,
created_by_user_id=created_by_user_id,
)
execution_session_id = _create_scheduled_execution_session(
execution_session_id = _get_or_create_scheduled_execution_session(
store,
tenant_id=tenant_id,
user_id=user_id,
job_id=job_id,
job_name=job_name,
run_id=run_id,
)
return ResolvedSession(
session_id=execution_session_id,