fix(tasks): keep scheduled-task prompt cache stable

Move scheduled-task current-time context out of the system prompt and into a user-role context message so the system prompt remains stable for prompt caching. Preserve time grounding on both the agent-loop path and fallback direct-call path, with focused regression coverage.
This commit is contained in:
hestiaOS
2026-06-28 01:05:02 +02:00
committed by GitHub
parent 259662e914
commit 8b110c28e6
4 changed files with 224 additions and 20 deletions
+23 -19
View File
@@ -1450,19 +1450,18 @@ class TaskScheduler:
system_prompt = f"{char_prompt}\n\n{system_prompt}"
except Exception:
pass
# Inject current time so the model knows what's past vs upcoming
# Provide current date/time as a user-role message so the system prompt
# stays byte-identical across runs and doesn't bust the Anthropic prompt
# cache on every scheduled tick (see issue #2927 and the identical fix on
# the interactive-chat path in src/agent_loop.py). The message is built
# once here and shared by both execution paths below (agent loop and the
# direct fallback) so time grounding is never lost on either path.
tz_name = _resolve_task_timezone(db, task)
try:
if tz_name:
from zoneinfo import ZoneInfo
from datetime import timezone
now_local = _utcnow().replace(tzinfo=timezone.utc).astimezone(ZoneInfo(tz_name))
time_str = now_local.strftime("%A, %B %d %Y, %H:%M %Z")
else:
time_str = _utcnow().strftime("%A, %B %d %Y, %H:%M UTC")
from src.user_time import current_datetime_context_message_for_tz
_dt_msg: dict | None = current_datetime_context_message_for_tz(tz_name)
except Exception:
time_str = _utcnow().strftime("%A, %B %d %Y, %H:%M UTC")
system_prompt = f"Current time: {time_str}\n\n{system_prompt}"
_dt_msg = None
# Compute the disabled-tools set: the crew's enabled_tools allowlist
# (inverted) plus the operator's global disabled_tools setting. The
@@ -1510,14 +1509,15 @@ class TaskScheduler:
endpoint_url, model, task, session_id,
system_prompt=system_prompt, disabled_tools=disabled_tools or None,
relevant_tools=relevant_tools,
datetime_context_msg=_dt_msg,
)
except Exception as e:
logger.warning(f"Agent loop failed for task '{task.name}', falling back to simple call: {e}")
from src.task_endpoint import task_llm_call_async
messages = [
{"role": "system", "content": system_prompt},
{"role": "user", "content": task.prompt},
]
messages: list = [{"role": "system", "content": system_prompt}]
if _dt_msg:
messages.append(_dt_msg)
messages.append({"role": "user", "content": task.prompt})
result = await task_llm_call_async(
messages,
fallback_url=endpoint_url,
@@ -1715,16 +1715,20 @@ class TaskScheduler:
system_prompt: str | None = None,
disabled_tools: set | None = None,
relevant_tools: set | None = None,
override_user_message: str | None = None) -> str:
override_user_message: str | None = None,
datetime_context_msg: dict | None = None) -> str:
"""Run the full agent loop with tool access, collecting the final text."""
from src.agent_loop import stream_agent_loop
system_content = system_prompt or "You are a helpful assistant executing a scheduled task. Use available tools to complete the task thoroughly."
user_content = override_user_message or task.prompt
messages = [
{"role": "system", "content": system_content},
{"role": "user", "content": user_content},
]
# Build the message list. The datetime context message (user-role) is
# inserted immediately before the task prompt so the system prefix stays
# byte-identical and cacheable across runs (see issue #2927).
messages: list = [{"role": "system", "content": system_content}]
if datetime_context_msg:
messages.append(datetime_context_msg)
messages.append({"role": "user", "content": user_content})
# Resolve headers from the endpoint's API key
headers = {}
+63
View File
@@ -138,6 +138,69 @@ def current_datetime_prompt(now_utc: Optional[datetime] = None) -> str:
)
def current_datetime_context_message_for_tz(
iana_tz_name: Optional[str],
now_utc: Optional[datetime] = None,
) -> Dict[str, str]:
"""Build the current-date/time context as a user-role message, resolved
against an explicit IANA timezone name rather than browser ContextVars.
Unlike ``current_datetime_context_message()``, this function does not read
or write any ContextVar and leaves no per-request state behind — it is safe
to call from background tasks that have no browser request context.
Timezone resolution:
* ``iana_tz_name`` is a valid IANA name (e.g. ``"Europe/Berlin"``) → uses that zone.
* ``iana_tz_name`` is ``None`` OR resolves to an invalid zone → falls back to UTC.
This matches the existing scheduler behaviour: tasks without a linked crew
timezone render in UTC, not server-local time.
"""
if now_utc is None:
utc_now = datetime.now(timezone.utc)
elif now_utc.tzinfo is None:
utc_now = now_utc.replace(tzinfo=timezone.utc)
else:
utc_now = now_utc.astimezone(timezone.utc)
# Resolve the display timezone — UTC fallback on any failure.
tz = timezone.utc
resolved_name: Optional[str] = None
if iana_tz_name:
try:
from zoneinfo import ZoneInfo
tz = ZoneInfo(iana_tz_name)
resolved_name = iana_tz_name
except Exception:
tz = timezone.utc # invalid zone → UTC, no ContextVar touched
local_now = utc_now.astimezone(tz)
tomorrow = local_now + timedelta(days=1)
_utc_offset = local_now.utcoffset()
offset_min = int(_utc_offset.total_seconds() // 60) if _utc_offset is not None else 0
offset_label = f"UTC{format_utc_offset(offset_min)}"
tz_label = f"{resolved_name}, {offset_label}" if resolved_name else offset_label
prompt = (
"## Current date and time\n"
f"Today is {_date_label(local_now)} ({local_now.strftime('%Y-%m-%d')}). "
f"Local time is {_clock_label(local_now)} ({tz_label}); "
f"current UTC time is {utc_now.strftime('%H:%M')}.\n"
f"Tomorrow is {_date_label(tomorrow)} ({tomorrow.strftime('%Y-%m-%d')}) "
"in this timezone.\n"
"Use this for any 'today', 'tomorrow', 'tonight', 'this week', or other "
"relative-date reasoning. Do not ask for an exact date just because the "
"user used a relative date.\n\n"
)
return {
"role": "user",
"content": (
"[Context — current date/time, refreshed each turn; not part of "
"your instructions]\n" + prompt
),
}
def current_datetime_context_message(now_utc: Optional[datetime] = None) -> Dict[str, str]:
"""Build the current-date/time context as a standalone chat message.