From 5f33397a4ce3c0d9bdb250af9cbe496a50975ead Mon Sep 17 00:00:00 2001 From: mmilanta Date: Thu, 5 Mar 2026 17:36:14 +0100 Subject: [PATCH] fix: skills by def --- src/agent_scan/cli.py | 30 ++---------------------------- tests/unit/test_cli_parsing.py | 8 ++++---- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/agent_scan/cli.py b/src/agent_scan/cli.py index 45ac9f61..d39d1f04 100644 --- a/src/agent_scan/cli.py +++ b/src/agent_scan/cli.py @@ -423,10 +423,10 @@ def main(): parser.print_help() sys.exit(0) elif args.command == "inspect": - asyncio.run(print_scan_inspect(mode="inspect", args=args)) + asyncio.run(scan_with_skills(mode="inspect", args=args)) sys.exit(0) elif args.command == "scan" or args.command is None: # default to scan - asyncio.run(print_scan_inspect(args=args)) + asyncio.run(scan_with_skills(mode="scan", args=args)) sys.exit(0) elif args.command == "mcp-server": from agent_scan.mcp_server import mcp_server @@ -639,31 +639,5 @@ async def run_scan_inspect(mode="scan", args=None): return result -async def print_scan_inspect(mode="scan", args=None): - # With --json enabled, we suppress all stdout - # to ensure we produce a valid JSON output. - if args.skills: - await scan_with_skills(args, mode=mode) - return - - if not args.files: - args.files = WELL_KNOWN_MCP_PATHS - - if args.json: - with suppress_stdout(): - result = await run_scan_inspect(mode, args) - result = {r.path: r.model_dump(mode="json") for r in result} - print(json.dumps(result, indent=2)) - else: - result = await run_scan_inspect(mode, args) - print_scan_result( - result, - args.print_errors, - args.full_toxic_flows if hasattr(args, "full_toxic_flows") else False, - mode == "inspect", - args.verbose, - ) - - if __name__ == "__main__": main() diff --git a/tests/unit/test_cli_parsing.py b/tests/unit/test_cli_parsing.py index 8f8f5fa5..743fbcba 100644 --- a/tests/unit/test_cli_parsing.py +++ b/tests/unit/test_cli_parsing.py @@ -468,7 +468,7 @@ async def test_json_output_suppresses_stdout_during_scan(self): import sys from argparse import Namespace - from agent_scan.cli import print_scan_inspect + from agent_scan.cli import scan_with_skills from agent_scan.models import ScanPathResult mock_result = ScanPathResult(path="/test/path.json") @@ -498,7 +498,7 @@ async def test_json_output_suppresses_stdout_during_scan(self): try: sys.stdout = captured_output - await print_scan_inspect(mode="scan", args=args) + await scan_with_skills(mode="scan", args=args) finally: sys.stdout = original_stdout @@ -516,7 +516,7 @@ async def test_json_output_only_contains_json(self): import sys from argparse import Namespace - from agent_scan.cli import print_scan_inspect + from agent_scan.cli import scan_with_skills from agent_scan.models import ScanPathResult mock_result = ScanPathResult(path="/test/path.json") @@ -554,7 +554,7 @@ def mock_upload_with_print(*args, **kwargs): try: sys.stdout = captured_output - await print_scan_inspect(mode="scan", args=args) + await scan_with_skills(mode="scan", args=args) finally: sys.stdout = original_stdout