b002dfc04d
A committed proactive tool-result prune (`prune_tool_results_only`, driven from `agent/turn_preflight.py::compress_after_tool_results`) demotes old skill_view and read_file bodies to one-line markers, but only the full-compaction path called `_reset_read_dedup_caches`. The repeat-view dedup therefore kept answering "unchanged / content_returned: false" for content that no longer existed in the transcript, so the `[SKILL_PRUNED: ... reload with skill_view(...)]` marker asked for a reload the tool then refused (#112763). Treat the committed prune as the same content-loss boundary compaction already is: reset the task's read/skill dedup right where the pruned list is committed. Sibling surface: manual `/compress` on CLI, TUI and the messaging gateway called `compress_now()` without `task_id`, so the boundary reset hit the "default" bucket instead of the session's. Pass the session-scoped task id on all three. Test double in tests/hermes_cli/test_cli_manual_compress.py gains the `task_id` kwarg the real `_compress_context` facade already accepts. Supersedes #103268 (@jo0wz), which reached the same path with a process-global ghost registry (not task-keyed, skill_view only).
91 lines
3.7 KiB
Python
91 lines
3.7 KiB
Python
"""skill_view repeat-view dedup registry: per-task cache of (skill name, file_path) ->
|
|
(skill file mtime+size). A repeat view of an UNCHANGED file returns a short stub — the earlier
|
|
tool result already carries the content verbatim. Cleared via ``reset_skill_view_dedup()`` on
|
|
context compression AND on a committed proactive tool-result prune, because both replace the
|
|
original content with a one-line marker.
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import threading
|
|
from typing import Dict
|
|
|
|
_skill_view_tracker: Dict[str, Dict[tuple, tuple]] = {}
|
|
_skill_view_tracker_lock = threading.Lock()
|
|
_SKILL_VIEW_DEDUP_CAP = 200
|
|
|
|
_SKILL_VIEW_DEDUP_MESSAGE = (
|
|
"Skill content unchanged since it was loaded earlier in this "
|
|
"conversation — refer to the earlier skill_view result; it is still "
|
|
"current and complete. (Re-issued after context compression, this "
|
|
"returns the full content again.)")
|
|
|
|
|
|
def _skill_view_fingerprint(payload: dict) -> tuple | None:
|
|
"""Stat the skill file a successful skill_view served, for change detection."""
|
|
if not (src := payload.get("_source_path")):
|
|
return None
|
|
try:
|
|
st = os.stat(src)
|
|
return (src, st.st_mtime_ns, st.st_size)
|
|
except OSError:
|
|
return None
|
|
|
|
|
|
def _record_skill_view(task_id, name, file_path, payload: dict) -> None:
|
|
"""Record a served skill_view so an identical repeat can be deduped."""
|
|
# Never dedup setup-needed views: readiness depends on config/env state that
|
|
# changes without the file changing; the model must see the refreshed status.
|
|
if (not task_id or payload.get("setup_needed")
|
|
or payload.get("readiness_status") == "setup_needed"):
|
|
return
|
|
if (fp := _skill_view_fingerprint(payload)) is None:
|
|
return
|
|
key = (str(payload.get("name") or name), file_path or "")
|
|
with _skill_view_tracker_lock:
|
|
cache = _skill_view_tracker.setdefault(str(task_id), {})
|
|
cache[key] = fp
|
|
while len(cache) > _SKILL_VIEW_DEDUP_CAP: # FIFO eviction
|
|
del cache[next(iter(cache))]
|
|
|
|
|
|
def _check_skill_view_dedup(task_id, name, file_path) -> str | None:
|
|
"""Dedup stub when this exact skill file was already served to this task and
|
|
is unchanged on disk; None otherwise."""
|
|
if not task_id:
|
|
return None
|
|
n = str(name)
|
|
with _skill_view_tracker_lock:
|
|
if not (cache := _skill_view_tracker.get(str(task_id))):
|
|
return None
|
|
# Record key is the RESOLVED name; match raw and resolved forms so
|
|
# 'category/skill' and bare-name views coalesce.
|
|
for key, (src, mtime_ns, size) in list(cache.items()):
|
|
rec_name, rec_fp = key
|
|
if rec_fp != (file_path or "") or (
|
|
rec_name != n and not n.endswith("/" + rec_name)
|
|
and not rec_name.endswith("/" + n) and n.split(":")[-1] != rec_name):
|
|
continue
|
|
try:
|
|
st = os.stat(src)
|
|
changed = (st.st_mtime_ns, st.st_size) != (mtime_ns, size)
|
|
except OSError:
|
|
changed = True
|
|
if changed:
|
|
cache.pop(key, None)
|
|
return None
|
|
return json.dumps({
|
|
"success": True, "status": "unchanged", "name": rec_name,
|
|
"file": file_path or "SKILL.md", "dedup": True, "content_returned": False,
|
|
"message": _SKILL_VIEW_DEDUP_MESSAGE}, ensure_ascii=False)
|
|
return None
|
|
|
|
|
|
def reset_skill_view_dedup(task_id: str | None = None) -> None:
|
|
"""Clear the dedup cache (all tasks when task_id is None); called on context compression."""
|
|
with _skill_view_tracker_lock:
|
|
if task_id is None:
|
|
_skill_view_tracker.clear()
|
|
else:
|
|
_skill_view_tracker.pop(str(task_id), None)
|