0xallam
dc9b9f5f9c
Cleanup pass after the migration: #1 Inline ``*_actions.py`` into wrapper ``tool[s].py`` for the non-sandbox tools (think, todo, notes, reporting, web_search, finish_scan). One file per tool family now. Helpers + public function bodies live alongside the ``@strix_tool``-decorated wrappers that call them. For notes, the sync helpers are renamed to ``_create_note_impl`` / ``_list_notes_impl`` / etc. so the public names ``create_note`` / ``list_notes`` / etc. can be the FunctionTool instances the agent factory imports. ``append_note_content`` (used by the agents-graph wiki-update hook) calls the impl helpers directly. #2 Delete ``strix/tools/_state_adapter.py``. The ``AgentStateAdapter`` shim only existed to feed legacy ``*_actions.py`` functions a ``state.agent_id`` they could read. With the actions inlined, the wrappers read ``ctx.context['agent_id']`` directly. #3 Strip ``strix/tools/registry.py`` from ~250 LOC to ~110. Deleted: XML schema loading, ``_parse_param_schema``, ``get_tools_prompt``, ``get_tool_param_schema``, ``needs_agent_state``, ``should_execute_in_sandbox``, ``validate_tool_availability`` — all for the host-side legacy dispatcher path. Kept the ``register_tool`` decorator (sandbox side), ``get_tool_by_name``, ``get_tool_names``, ``tools`` list, ``clear_registry``. The Jinja prompt template's ``{{ get_tools_prompt() }}`` injection is dropped — the SDK auto-generates tool descriptions from function signatures, so the legacy XML tool block was redundant and stale. #4 Delete every ``*_actions_schema.xml`` (12 files). They were read by the now-removed ``_load_xml_schema`` to build the legacy prompt's tool descriptions. No consumer remains. Side fixes: - ``reporting_renderer.py`` updated to import ``_parse_*_xml`` from the new location with leading underscore. - ``test_local_tools.py``, ``test_notes_jsonl_concurrency.py``, ``test_notes_wiki.py`` updated to point at the new module paths and call the ``_*_impl`` sync helpers. Tests: 279/279 passing. ~1500 LOC of action files moved into the tool wrappers; ~140 LOC of registry boilerplate removed; ~400 lines of dead XML deleted. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
215 lines
7.3 KiB
Python
215 lines
7.3 KiB
Python
from pathlib import Path
|
|
|
|
from strix.telemetry.tracer import Tracer, get_global_tracer, set_global_tracer
|
|
from strix.tools.notes import tools as notes_actions
|
|
|
|
|
|
def _reset_notes_state() -> None:
|
|
notes_actions._notes_storage.clear()
|
|
notes_actions._loaded_notes_run_dir = None
|
|
|
|
|
|
def test_wiki_notes_are_persisted_and_removed(tmp_path: Path, monkeypatch) -> None:
|
|
monkeypatch.chdir(tmp_path)
|
|
_reset_notes_state()
|
|
|
|
previous_tracer = get_global_tracer()
|
|
tracer = Tracer("wiki-test-run")
|
|
set_global_tracer(tracer)
|
|
|
|
try:
|
|
created = notes_actions._create_note_impl(
|
|
title="Repo Map",
|
|
content="## Architecture\n- monolith",
|
|
category="wiki",
|
|
tags=["source-map"],
|
|
)
|
|
assert created["success"] is True
|
|
note_id = created["note_id"]
|
|
assert isinstance(note_id, str)
|
|
|
|
note = notes_actions._notes_storage[note_id]
|
|
wiki_filename = note.get("wiki_filename")
|
|
assert isinstance(wiki_filename, str)
|
|
|
|
wiki_path = tmp_path / "strix_runs" / "wiki-test-run" / "wiki" / wiki_filename
|
|
assert wiki_path.exists()
|
|
assert "## Architecture" in wiki_path.read_text(encoding="utf-8")
|
|
|
|
updated = notes_actions._update_note_impl(
|
|
note_id=note_id,
|
|
content="## Architecture\n- service-oriented",
|
|
)
|
|
assert updated["success"] is True
|
|
assert "service-oriented" in wiki_path.read_text(encoding="utf-8")
|
|
|
|
deleted = notes_actions._delete_note_impl(note_id=note_id)
|
|
assert deleted["success"] is True
|
|
assert wiki_path.exists() is False
|
|
finally:
|
|
_reset_notes_state()
|
|
set_global_tracer(previous_tracer) # type: ignore[arg-type]
|
|
|
|
|
|
def test_notes_jsonl_replay_survives_memory_reset(tmp_path: Path, monkeypatch) -> None:
|
|
monkeypatch.chdir(tmp_path)
|
|
_reset_notes_state()
|
|
|
|
previous_tracer = get_global_tracer()
|
|
tracer = Tracer("notes-replay-run")
|
|
set_global_tracer(tracer)
|
|
|
|
try:
|
|
created = notes_actions._create_note_impl(
|
|
title="Auth findings",
|
|
content="initial finding",
|
|
category="findings",
|
|
tags=["auth"],
|
|
)
|
|
assert created["success"] is True
|
|
note_id = created["note_id"]
|
|
assert isinstance(note_id, str)
|
|
|
|
notes_path = tmp_path / "strix_runs" / "notes-replay-run" / "notes" / "notes.jsonl"
|
|
assert notes_path.exists() is True
|
|
|
|
_reset_notes_state()
|
|
listed = notes_actions._list_notes_impl(category="findings")
|
|
assert listed["success"] is True
|
|
assert listed["total_count"] == 1
|
|
assert listed["notes"][0]["note_id"] == note_id
|
|
assert "content" not in listed["notes"][0]
|
|
assert "content_preview" in listed["notes"][0]
|
|
|
|
updated = notes_actions._update_note_impl(note_id=note_id, content="updated finding")
|
|
assert updated["success"] is True
|
|
|
|
_reset_notes_state()
|
|
listed_after_update = notes_actions._list_notes_impl(search="updated finding")
|
|
assert listed_after_update["success"] is True
|
|
assert listed_after_update["total_count"] == 1
|
|
assert listed_after_update["notes"][0]["note_id"] == note_id
|
|
assert listed_after_update["notes"][0]["content_preview"] == "updated finding"
|
|
|
|
listed_with_content = notes_actions._list_notes_impl(
|
|
category="findings",
|
|
include_content=True,
|
|
)
|
|
assert listed_with_content["success"] is True
|
|
assert listed_with_content["total_count"] == 1
|
|
assert listed_with_content["notes"][0]["content"] == "updated finding"
|
|
|
|
deleted = notes_actions._delete_note_impl(note_id=note_id)
|
|
assert deleted["success"] is True
|
|
|
|
_reset_notes_state()
|
|
listed_after_delete = notes_actions._list_notes_impl(category="findings")
|
|
assert listed_after_delete["success"] is True
|
|
assert listed_after_delete["total_count"] == 0
|
|
finally:
|
|
_reset_notes_state()
|
|
set_global_tracer(previous_tracer) # type: ignore[arg-type]
|
|
|
|
|
|
def test_get_note_returns_full_note(tmp_path: Path, monkeypatch) -> None:
|
|
monkeypatch.chdir(tmp_path)
|
|
_reset_notes_state()
|
|
|
|
previous_tracer = get_global_tracer()
|
|
tracer = Tracer("get-note-run")
|
|
set_global_tracer(tracer)
|
|
|
|
try:
|
|
created = notes_actions._create_note_impl(
|
|
title="Repo wiki",
|
|
content="entrypoints and sinks",
|
|
category="wiki",
|
|
tags=["repo:appsmith"],
|
|
)
|
|
assert created["success"] is True
|
|
note_id = created["note_id"]
|
|
assert isinstance(note_id, str)
|
|
|
|
result = notes_actions._get_note_impl(note_id=note_id)
|
|
assert result["success"] is True
|
|
assert result["note"]["note_id"] == note_id
|
|
assert result["note"]["content"] == "entrypoints and sinks"
|
|
finally:
|
|
_reset_notes_state()
|
|
set_global_tracer(previous_tracer) # type: ignore[arg-type]
|
|
|
|
|
|
def test_append_note_content_appends_delta(tmp_path: Path, monkeypatch) -> None:
|
|
monkeypatch.chdir(tmp_path)
|
|
_reset_notes_state()
|
|
|
|
previous_tracer = get_global_tracer()
|
|
tracer = Tracer("append-note-run")
|
|
set_global_tracer(tracer)
|
|
|
|
try:
|
|
created = notes_actions._create_note_impl(
|
|
title="Repo wiki",
|
|
content="base",
|
|
category="wiki",
|
|
tags=["repo:demo"],
|
|
)
|
|
assert created["success"] is True
|
|
note_id = created["note_id"]
|
|
assert isinstance(note_id, str)
|
|
|
|
appended = notes_actions.append_note_content(
|
|
note_id=note_id,
|
|
delta="\n\n## Agent Update: worker\nSummary: done",
|
|
)
|
|
assert appended["success"] is True
|
|
|
|
loaded = notes_actions._get_note_impl(note_id=note_id)
|
|
assert loaded["success"] is True
|
|
assert loaded["note"]["content"] == "base\n\n## Agent Update: worker\nSummary: done"
|
|
finally:
|
|
_reset_notes_state()
|
|
set_global_tracer(previous_tracer) # type: ignore[arg-type]
|
|
|
|
|
|
def test_list_and_get_note_handle_wiki_repersist_oserror_gracefully(
|
|
tmp_path: Path, monkeypatch
|
|
) -> None:
|
|
monkeypatch.chdir(tmp_path)
|
|
_reset_notes_state()
|
|
|
|
previous_tracer = get_global_tracer()
|
|
tracer = Tracer("wiki-repersist-oserror-run")
|
|
set_global_tracer(tracer)
|
|
|
|
try:
|
|
created = notes_actions._create_note_impl(
|
|
title="Repo wiki",
|
|
content="initial wiki content",
|
|
category="wiki",
|
|
tags=["repo:demo"],
|
|
)
|
|
assert created["success"] is True
|
|
note_id = created["note_id"]
|
|
assert isinstance(note_id, str)
|
|
|
|
_reset_notes_state()
|
|
|
|
def _raise_oserror(*_args, **_kwargs) -> None:
|
|
raise OSError("disk full")
|
|
|
|
monkeypatch.setattr(notes_actions, "_persist_wiki_note", _raise_oserror)
|
|
|
|
listed = notes_actions._list_notes_impl(category="wiki")
|
|
assert listed["success"] is True
|
|
assert listed["total_count"] == 1
|
|
assert listed["notes"][0]["note_id"] == note_id
|
|
|
|
fetched = notes_actions._get_note_impl(note_id=note_id)
|
|
assert fetched["success"] is True
|
|
assert fetched["note"]["note_id"] == note_id
|
|
assert fetched["note"]["content"] == "initial wiki content"
|
|
finally:
|
|
_reset_notes_state()
|
|
set_global_tracer(previous_tracer) # type: ignore[arg-type]
|