mirror of
https://github.com/usestrix/strix.git
synced 2026-08-18 17:52:32 +02:00
0xallam
5606504563
The SDK harness is the only path now; legacy host-side code is gone. File names no longer carry the ``sdk_`` distinction. Deleted legacy host-side modules: - strix/agents/StrixAgent/ (template moved to strix/agents/prompts/) - strix/agents/base_agent.py, state.py - strix/llm/llm.py, config.py - strix/runtime/docker_runtime.py, runtime.py - strix/tools/executor.py, agents_graph/agents_graph_actions.py - strix/interface/sdk_dispatch.py + the env-flag dispatch in cli.py Renamed (drop ``sdk_`` prefix): - strix/sdk_entry.py → strix/entry.py - strix/agents/sdk_factory.py → strix/agents/factory.py - strix/agents/sdk_prompt.py → strix/agents/prompt.py - strix/tools/<x>/<x>_sdk_tool[s].py → strix/tools/<x>/tool[s].py - strix/tools/_legacy_adapter.py → strix/tools/_state_adapter.py - ``_legacy`` aliases inside the wrappers → ``_impl`` CLI + TUI now call ``run_strix_scan`` directly — they build the sandbox image / sources_path locally and rely on ``session_manager.cleanup`` (called inside ``run_strix_scan``'s finally) for teardown. Three TUI handlers that reached into legacy multi-agent globals (``_agent_instances``, ``send_user_message_to_agent``, ``stop_agent``) are now no-ops with a TODO; reconnecting them to the ``AgentMessageBus`` is a follow-up. Tracer.get_total_llm_stats no longer reaches into the deleted ``agents_graph_actions`` globals — the orchestration hooks now feed the tracer via ``Tracer.record_llm_usage`` (live + completed buckets). finish_scan's ``_check_active_agents`` and load_skill's runtime ``_agent_instances`` reach-in are no-op stubs; the ``AgentMessageBus`` is the source of truth post-migration. llm/utils.py rewritten to keep only the streaming-parser helpers (``normalize_tool_format``, ``parse_tool_invocations``, ``fix_incomplete_tool_call``, ``format_tool_call``, ``clean_content``). ``STRIX_MODEL_MAP`` moved to ``llm/multi_provider_setup.py`` (its only remaining caller). Per-file ruff ignores added for legacy interface modules (TUI / main / CLI / utils / streaming_parser / tool_components) and tracer.py — pre-existing PLC0415/BLE001/PLR0915 patterns are out of scope. Tests: 287/287 passing. Renamed test files to drop ``sdk_`` prefix. ``test_tracer.py::test_get_total_llm_stats_aggregates_live_and_completed`` rewritten to feed ``Tracer.record_llm_usage`` instead of legacy globals. Test file annotations added so pre-commit's strict mypy passes.
47 lines
1.6 KiB
Python
47 lines
1.6 KiB
Python
"""SDK function-tool wrapper for the legacy ``load_skill`` tool.
|
|
|
|
The legacy implementation reaches into ``_agent_instances`` (a global
|
|
dict the legacy multi-agent orchestrator maintains) to find the running
|
|
``Agent`` instance and call ``agent.llm.add_skills(...)``. That global
|
|
goes away under the SDK migration — Phase 3 will replace it with a
|
|
context-keyed registry, and this wrapper will be updated to read from
|
|
that registry.
|
|
|
|
For Phase 2 we ship the wrapper as-is. The legacy function falls back
|
|
to a clean error path when the agent instance lookup fails, so the
|
|
tool degrades gracefully ("Could not find running agent instance...")
|
|
until Phase 3 lands. That's better than crashing or stubbing out the
|
|
tool entirely — the model still gets a structured error it can react to.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json
|
|
from typing import Any
|
|
|
|
from agents import RunContextWrapper
|
|
|
|
from strix.tools._decorator import strix_tool
|
|
from strix.tools._state_adapter import adapter_from_ctx
|
|
from strix.tools.load_skill import load_skill_actions as _impl
|
|
|
|
|
|
def _dump(result: dict[str, Any]) -> str:
|
|
return json.dumps(result, ensure_ascii=False, default=str)
|
|
|
|
|
|
@strix_tool(timeout=60)
|
|
async def load_skill(ctx: RunContextWrapper, skills: str) -> str:
|
|
"""Load one or more named skills into this agent's prompt context.
|
|
|
|
Args:
|
|
skills: Comma-separated skill names (max 5). E.g.
|
|
``"recon,xss,sqli"``. Skill discovery uses
|
|
``strix.skills.parse_skill_list``.
|
|
"""
|
|
state = adapter_from_ctx(ctx)
|
|
return _dump(
|
|
await asyncio.to_thread(_impl.load_skill, agent_state=state, skills=skills),
|
|
)
|