Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 2 additions & 28 deletions src/agent_scan/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
8 changes: 4 additions & 4 deletions tests/unit/test_cli_parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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

Expand All @@ -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")
Expand Down Expand Up @@ -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

Expand Down
Loading