praetorian-cli 2.4.0__tar.gz → 2.4.1__tar.gz

{praetorian_cli-2.4.0/praetorian_cli.egg-info → praetorian_cli-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praetorian-cli
-Version: 2.4.0
+Version: 2.4.1
 Summary: For interacting with the Guard API
 Home-page: https://github.com/praetorian-inc/praetorian-cli
 Author: Praetorian

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/handlers/export.py

@@ -25,6 +25,8 @@ def export():
 @click.option('--end-date', default='', help='Engagement end date (ISO format)')
 @click.option('--report-date', default='', help='Report date (ISO format). Default: today')
 @click.option('--draft/--no-draft', default=False, help='Add DRAFT watermark')
+@click.option('--retest/--no-retest', default=False,
+              help='Include retest status badges and sections')
 @click.option('--version', 'report_version', default='1.0', help='Report version string')
 @click.option('--format', 'export_format', type=click.Choice(['pdf', 'zip']),
               default='pdf', help='Export format')
@@ -45,7 +47,7 @@ def export():
 @click.option('--no-download', is_flag=True, default=False,
               help='Skip downloading the file; just print the job result')
 def report(chariot, title, client_name, status_filter, risk_keys,
-           target, start_date, end_date, report_date, draft,
+           target, start_date, end_date, report_date, draft, retest,
            report_version, export_format, group_by, shared,
            executive_summary, narratives, appendix, output,
            timeout, no_download):
@@ -80,6 +82,7 @@ def report(chariot, title, client_name, status_filter, risk_keys,
         end_date=end_date,
         report_date=report_date,
         draft=draft,
+        retest=retest,
         version=report_version,
         export_format=export_format,
         group_by=group_by,

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/handlers/run.py

@@ -175,26 +175,109 @@ def tool(sdk, tool_name, target, extra_config, credential, wait, use_agent, loca
 
 @run.command('list')
 @cli_handler
-def list_tools(sdk):
-    """ List named agents and their descriptions
+@click.option('-s', '--surface', default='', help='Filter by surface (external, internal, cloud, repository, application)')
+@click.option('-e', '--executor', default='', help='Filter by executor (chariot, janus, aegis, aurelian, agent)')
+@click.option('--json', 'as_json', is_flag=True, default=False, help='Output as JSON')
+def list_tools(sdk, surface, executor, as_json):
+    """ List all available tools and capabilities
 
     \b
-    Example usage:
+    Shows all Guard capabilities with descriptions, indicating which can
+    be installed locally. Use --surface or --executor to filter.
+
+    \b
+    Example usages:
         guard run list
+        guard run list --surface external
+        guard run list --executor agent
+        guard run list --json
     """
-    click.echo(f'\n{"Agent":<16} {"Description"}')
-    click.echo(f'{"─"*16} {"─"*50}')
-    for name, desc in sorted(FRIENDLY_NAMES.items()):
-        click.echo(f'{name:<16} {desc}')
-    click.echo(f'\nUse "guard run capabilities" for the full list of backend capabilities.')
+    from praetorian_cli.runners.local import INSTALLABLE_TOOLS, list_installed
+
+    try:
+        result = sdk.capabilities.list()
+        caps = result[0] if isinstance(result, tuple) else result
+        if not isinstance(caps, list):
+            caps = []
+    except Exception:
+        caps = []
+
+    if not caps:
+        click.echo('Could not fetch capabilities from backend.', err=True)
+        click.echo(f'\nLocally installable tools:')
+        for name, info in sorted(INSTALLABLE_TOOLS.items()):
+            click.echo(f'  {name:<18} {info["description"]}')
+        return
+
+    if as_json:
+        print_json(caps)
+        return
+
+    installed = list_installed()
+
+    # Apply filters
+    if surface:
+        caps = [c for c in caps if c.get('surface', '') == surface]
+    if executor:
+        caps = [c for c in caps if c.get('executor', '') == executor]
+
+    if not caps:
+        click.echo('No capabilities match the filters.')
+        return
+
+    # Sort: installable first, then by name
+    def sort_key(c):
+        name = c.get('name', '')
+        is_installable = name in INSTALLABLE_TOOLS
+        return (not is_installable, name)
+
+    caps.sort(key=sort_key)
+
+    # Render table
+    click.echo(f'\n{"Name":<22} {"Type":<10} {"Surface":<12} {"Description"}')
+    click.echo(f'{"─"*22} {"─"*10} {"─"*12} {"─"*48}')
+
+    for c in caps:
+        name = c.get('name', '')
+        desc = c.get('description', '') or c.get('title', '')
+        cap_surface = c.get('surface', '')
+        cap_executor = c.get('executor', '')
+
+        # Determine type label
+        if name in INSTALLABLE_TOOLS:
+            if name in installed:
+                type_label = 'local ✓'
+            else:
+                type_label = 'local'
+        elif cap_executor == 'agent':
+            type_label = 'agent'
+        else:
+            type_label = 'remote'
+
+        # Truncate description
+        max_desc = 55
+        if len(desc) > max_desc:
+            desc = desc[:max_desc - 1] + '…'
+
+        click.echo(f'{name:<22} {type_label:<10} {cap_surface:<12} {desc}')
+
+    click.echo(f'\n{len(caps)} capabilities')
+    installable_count = sum(1 for c in caps if c.get('name', '') in INSTALLABLE_TOOLS)
+    installed_count = sum(1 for c in caps if c.get('name', '') in installed)
+    if installable_count:
+        click.echo(f'{installable_count} installable locally ({installed_count} installed) — use "guard run install <name>"')
 
 
 @run.command('capabilities')
 @cli_handler
 @click.option('-n', '--name', default='', help='Filter by capability name')
 @click.option('-t', '--target', default='', help='Filter by target type')
-def capabilities(sdk, name, target):
-    """ List all available capabilities from the backend
+@click.option('-e', '--executor', default='', help='Filter by executor')
+def capabilities(sdk, name, target, executor):
+    """ List all capabilities as JSON (for scripting)
+
+    \b
+    Full machine-readable output. For a human-readable view, use "guard run list".
 
     \b
     Example usages:
@@ -202,8 +285,9 @@ def capabilities(sdk, name, target):
         guard run capabilities --name nuclei
         guard run capabilities --target asset
     """
-    result = sdk.capabilities.list(name=name, target=target)
-    print_json(result)
+    result = sdk.capabilities.list(name=name, target=target, executor=executor)
+    caps = result[0] if isinstance(result, tuple) else result
+    print_json(caps)
 
 
 @run.command('install')

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/runners/local.py

@@ -71,7 +71,10 @@ def is_installed(tool_name: str) -> bool:
 def install_tool(tool_name: str, force=False) -> str:
     """Download and install a tool from GitHub releases. Returns binary path."""
     if tool_name not in INSTALLABLE_TOOLS:
-        raise ValueError(f'Unknown tool: {tool_name}. Available: {", ".join(sorted(INSTALLABLE_TOOLS))}')
+        lines = [f'Unknown tool: {tool_name}. Installable tools:']
+        for name in sorted(INSTALLABLE_TOOLS):
+            lines.append(f'  {name:<18} {INSTALLABLE_TOOLS[name]["description"]}')
+        raise ValueError('\n'.join(lines))
 
     if not force and is_installed(tool_name):
         return get_binary_path(tool_name)

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/sdk/entities/reports.py

@@ -35,7 +35,8 @@ class Reports:
     def build_export_body(self, title, client_name, customer_email,
                           status_filter=('O', 'T'), risk_keys=(),
                           target='', start_date='', end_date='',
-                          report_date='', draft=False, version='1.0',
+                          report_date='', draft=False, retest=False,
+                          version='1.0',
                           export_format='pdf', group_by='attack_surface',
                           shared_output=False, executive_summary_path='',
                           narratives_path='', appendix_path=''):
@@ -62,6 +63,8 @@ class Reports:
         :type report_date: str
         :param draft: Whether to add DRAFT watermark
         :type draft: bool
+        :param retest: Whether to include retest status badges and sections
+        :type retest: bool
         :param version: Report version string
         :type version: str
         :param export_format: Output format ('pdf' or 'zip')
@@ -89,6 +92,7 @@ class Reports:
                 'client_name': client_name,
                 'report_date': report_date,
                 'draft': draft,
+                'retest': retest,
                 'version': version,
             },
             'shared_output': shared_output,

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/sdk/test/test_report.py

@@ -52,6 +52,7 @@ class TestBuildExportBody:
         assert body['group_by'] == 'attack_surface'
         assert body['shared_output'] is False
         assert body['config']['draft'] is False
+        assert body['config']['retest'] is False
         assert body['config']['version'] == '1.0'
         assert 'risk_keys' not in body
         assert 'target' not in body['config']
@@ -85,6 +86,7 @@ class TestBuildExportBody:
             end_date='2026-03-01',
             report_date='2026-03-15',
             draft=True,
+            retest=True,
             version='2.0',
             export_format='zip',
             group_by='tag',
@@ -99,6 +101,7 @@ class TestBuildExportBody:
         assert body['config']['start_date'] == '2026-01-01'
         assert body['config']['end_date'] == '2026-03-01'
         assert body['config']['draft'] is True
+        assert body['config']['retest'] is True
         assert body['config']['version'] == '2.0'
         assert body['export_format'] == 'zip'
         assert body['group_by'] == 'tag'

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/ui/console/commands/search.py

@@ -12,15 +12,29 @@ class SearchCommands:
         if not args:
             self.console.print('[dim]Usage: search <term> [--kind <type>][/dim]')
             return
-        term = ' '.join(args)
-        try:
-            kind = None
-            if '--kind' in args:
-                idx = args.index('--kind')
-                if idx + 1 < len(args):
-                    kind = args[idx + 1]
-                    term = ' '.join(args[:idx])
 
+        # Parse args
+        raw_args = list(args)
+        kind = None
+        if '--kind' in raw_args:
+            idx = raw_args.index('--kind')
+            if idx + 1 < len(raw_args):
+                kind = raw_args[idx + 1]
+                raw_args = raw_args[:idx] + raw_args[idx + 2:]
+        term = ' '.join(raw_args)
+
+        # Context-smart: if we have paged results, filter them locally first
+        if self._paged_results and not kind:
+            filtered = [
+                r for r in self._paged_results
+                if term.lower() in (r.get('key', '') + ' ' + r.get('name', '') + ' ' + r.get('dns', '') + ' ' + r.get('title', '')).lower()
+            ]
+            if filtered:
+                self._render_results(filtered, f'Search: "{term}" in {self._paged_title}')
+                return
+
+        # Fall through to API search
+        try:
             results, offset = self.sdk.search.by_term(term, kind)
             self._render_results(results, f'Search: {term}')
         except Exception as e:
@@ -34,7 +48,7 @@ class SearchCommands:
         # Parse args
         term = []
         kind = None
-        limit = 100
+        limit = 200
         i = 0
         while i < len(args):
             if args[i] == '--type' and i + 1 < len(args):
@@ -54,23 +68,30 @@ class SearchCommands:
             self.console.print(f'[error]{e}[/error]')
             return
 
-        self._render_results(all_results, f'Find: {term}')
+        if not kind and all_results:
+            # Cross-type display: group by entity type and show type labels
+            self._render_typed_results(all_results, f'Find: {term}')
+        else:
+            self._render_results(all_results, f'Find: {term}')
+
         if len(all_results) >= limit:
-            self.console.print(f'[warning]Showing {limit} results. Use --limit to increase.[/warning]')
+            self.console.print(f'[dim]Showing {limit} results. Use --limit to increase.[/dim]')
 
     def _cmd_assets(self, args):
         try:
-            filter_text = self.context.scope or ''
+            filter_text = ' '.join(args) if args else (self.context.scope or '')
             results, _ = self.sdk.assets.list(filter_text, pages=1)
-            self._render_results(results, 'Assets')
+            title = f'Assets: {filter_text}' if filter_text else 'Assets'
+            self._render_results(results, title)
         except Exception as e:
             self.console.print(f'[error]{e}[/error]')
 
     def _cmd_risks(self, args):
         try:
-            filter_text = self.context.scope or ''
+            filter_text = ' '.join(args) if args else (self.context.scope or '')
             results, _ = self.sdk.risks.list(filter_text, pages=1)
-            self._render_results(results, 'Risks')
+            title = f'Risks: {filter_text}' if filter_text else 'Risks'
+            self._render_results(results, title)
         except Exception as e:
             self.console.print(f'[error]{e}[/error]')
 

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/ui/console/console.py

@@ -36,6 +36,7 @@ CONSOLE_COMMANDS = [
     'use', 'options', 'execute', 'exploit', 'back',
     'accounts', 'engagements', 'home', 'su',
     'search', 'find', 'assets', 'risks', 'jobs', 'info',
+    'next', 'n', 'prev', 'p', 'page',
     'scan', 'tag',
     'run', 'status', 'download', 'install', 'installed',
     'asset-analyzer', 'brutus', 'julius', 'augustus', 'aurelius',
@@ -190,6 +191,11 @@ class GuardConsole(
             'risks': self._cmd_risks,
             'jobs': self._cmd_jobs,
             'info': self._cmd_info,
+            'next': self._cmd_next,
+            'n': self._cmd_next,
+            'prev': self._cmd_prev,
+            'p': self._cmd_prev,
+            'page': self._cmd_page,
             'scan': self._cmd_scan,
             'tag': self._cmd_tag,
             'run': self._cmd_run,
@@ -289,11 +295,14 @@ class GuardConsole(
 
         help_table.add_row('', '')
         help_table.add_row('[section]Search & Recon[/section]', '')
-        help_table.add_row('search <term>', 'Fast prefix search (DynamoDB)')
-        help_table.add_row('find <term> [--type X]', 'Fulltext search (Neo4j)')
-        help_table.add_row('assets', 'List assets (respects scope)')
-        help_table.add_row('risks', 'List risks (respects scope)')
+        help_table.add_row('search <term>', 'Smart search (filters current results, or API search)')
+        help_table.add_row('find <term> [--type X]', 'Fulltext search across all entity types (Neo4j)')
+        help_table.add_row('assets [filter]', 'List assets (prefix filter or scope)')
+        help_table.add_row('risks [filter]', 'List risks (prefix filter or scope)')
         help_table.add_row('jobs [filter]', 'List jobs (filter by target/capability)')
+        help_table.add_row('next / n', 'Next page of results')
+        help_table.add_row('prev / p', 'Previous page of results')
+        help_table.add_row('page <#>', 'Jump to page number')
         help_table.add_row('status', 'Check status of last job')
         help_table.add_row('status <job_key>', 'Check status of specific job')
         help_table.add_row('download [proofs|agents|all]', 'Download job outputs to local dir')

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/praetorian_cli/ui/console/renderer.py

@@ -9,22 +9,42 @@ from rich.text import Text
 class RendererMixin:
     """Rendering helpers for console output. Mixed into GuardConsole."""
 
-    def _render_results(self, results: list, title: str):
+    # Pagination state
+    _paged_results = None   # full result list
+    _paged_title = ''       # title for the listing
+    _paged_page = 0         # current page (0-indexed)
+    _page_size = 50         # items per page
+
+    def _render_results(self, results: list, title: str, page: int = 0):
         if not results:
             self.console.print(f'[dim]No results for: {title}[/dim]')
             if self.context.scope:
                 self.console.print(f'[dim]Current scope: {self.context.scope} -- use "unset scope" to broaden[/dim]')
             return
 
-        table = Table(title=f'{title} ({len(results)} results)', border_style=self.colors['primary'])
-        table.add_column('#', style=self.colors['dim'], width=4)
+        # Store for pagination
+        self._paged_results = results
+        self._paged_title = title
+        self._paged_page = page
+
+        total = len(results)
+        start = page * self._page_size
+        end = min(start + self._page_size, total)
+        page_items = results[start:end]
+        total_pages = (total + self._page_size - 1) // self._page_size
+
+        table = Table(
+            title=f'{title} ({total} results) — page {page + 1}/{total_pages}',
+            border_style=self.colors['primary'],
+        )
+        table.add_column('#', style=self.colors['dim'], width=6)
         table.add_column('Key', style=self.colors['primary'])
         table.add_column('Name', style='white')
         table.add_column('Status', style=self.colors['accent'])
 
         # Update _target_list so "set target <#>" works from any listing
         self._target_list = []
-        for i, item in enumerate(results[:100], 1):
+        for i, item in enumerate(page_items, start + 1):
             key = item.get('key', '')
             name = item.get('name', item.get('dns', item.get('title', '')))
             status = item.get('status', '')
@@ -32,8 +52,133 @@ class RendererMixin:
             self._target_list.append(key)
 
         self.console.print(table)
-        if len(results) > 100:
-            self.console.print(f'[dim]Showing first 100 of {len(results)} results[/dim]')
+
+        # Pagination hint
+        hints = []
+        if page > 0:
+            hints.append('"prev" or "p"')
+        if end < total:
+            hints.append('"next" or "n"')
+        if total_pages > 2:
+            hints.append(f'"page <1-{total_pages}>"')
+        if hints:
+            self.console.print(f'[dim]{" | ".join(hints)}[/dim]')
+
+    def _cmd_next(self, args):
+        """Show next page of results."""
+        if not self._paged_results:
+            self.console.print('[dim]No results to page through.[/dim]')
+            return
+        total_pages = (len(self._paged_results) + self._page_size - 1) // self._page_size
+        if self._paged_page + 1 >= total_pages:
+            self.console.print('[dim]Already on the last page.[/dim]')
+            return
+        self._render_results(self._paged_results, self._paged_title, self._paged_page + 1)
+
+    def _cmd_prev(self, args):
+        """Show previous page of results."""
+        if not self._paged_results:
+            self.console.print('[dim]No results to page through.[/dim]')
+            return
+        if self._paged_page <= 0:
+            self.console.print('[dim]Already on the first page.[/dim]')
+            return
+        self._render_results(self._paged_results, self._paged_title, self._paged_page - 1)
+
+    def _cmd_page(self, args):
+        """Jump to a specific page: page <number>"""
+        if not self._paged_results:
+            self.console.print('[dim]No results to page through.[/dim]')
+            return
+        if not args:
+            self.console.print('[dim]Usage: page <number>[/dim]')
+            return
+        try:
+            page_num = int(args[0]) - 1  # 1-indexed input
+        except ValueError:
+            self.console.print('[dim]Usage: page <number>[/dim]')
+            return
+        total_pages = (len(self._paged_results) + self._page_size - 1) // self._page_size
+        if page_num < 0 or page_num >= total_pages:
+            self.console.print(f'[dim]Page must be between 1 and {total_pages}.[/dim]')
+            return
+        self._render_results(self._paged_results, self._paged_title, page_num)
+
+    def _render_typed_results(self, results: list, title: str):
+        """Render results with entity type labels — used for cross-type searches."""
+        if not results:
+            self.console.print(f'[dim]No results for: {title}[/dim]')
+            return
+
+        # Store for pagination
+        self._paged_results = results
+        self._paged_title = title
+        self._paged_page = 0
+
+        total = len(results)
+        page_items = results[:self._page_size]
+        total_pages = (total + self._page_size - 1) // self._page_size
+
+        table = Table(
+            title=f'{title} ({total} results) — page 1/{total_pages}',
+            border_style=self.colors['primary'],
+        )
+        table.add_column('#', style=self.colors['dim'], width=6)
+        table.add_column('Type', style=self.colors['accent'], width=10)
+        table.add_column('Key', style=self.colors['primary'])
+        table.add_column('Name', style='white')
+        table.add_column('Status', style=self.colors['accent'])
+
+        self._target_list = []
+        for i, item in enumerate(page_items, 1):
+            key = item.get('key', '')
+            name = item.get('name', item.get('dns', item.get('title', '')))
+            status = item.get('status', '')
+
+            # Infer type from key
+            entity_type = '?'
+            if key.startswith('#risk#'):
+                entity_type = 'risk'
+            elif key.startswith('#asset#'):
+                entity_type = 'asset'
+            elif key.startswith('#ad'):
+                # AD subtypes: aduser, adgroup, adcomputer, addomain, adenterpriseca, etc.
+                parts = key.split('#')
+                entity_type = parts[1] if len(parts) > 1 else 'ad'
+            elif key.startswith('#seed#'):
+                entity_type = 'seed'
+            elif key.startswith('#job#'):
+                entity_type = 'job'
+            elif key.startswith('#port#') or key.startswith('#attribute#'):
+                parts = key.split('#')
+                entity_type = parts[1] if len(parts) > 1 else 'other'
+            else:
+                parts = key.split('#')
+                entity_type = parts[1] if len(parts) > 2 else 'other'
+
+            table.add_row(str(i), entity_type, key, str(name), status)
+            self._target_list.append(key)
+
+        self.console.print(table)
+
+        # Type summary
+        from collections import Counter
+        type_counts = Counter()
+        for item in results:
+            key = item.get('key', '')
+            parts = key.split('#')
+            t = parts[1] if len(parts) > 2 else 'other'
+            type_counts[t] += 1
+        summary = ', '.join(f'{count} {t}' for t, count in type_counts.most_common())
+        self.console.print(f'[dim]{summary}[/dim]')
+
+        hints = []
+        if total_pages > 1:
+            hints.append('"next" or "n"')
+        if total_pages > 2:
+            hints.append(f'"page <1-{total_pages}>"')
+        if hints:
+            self.console.print(f'[dim]{" | ".join(hints)}[/dim]')
 
     def _render_evidence(self, hydrated: dict):
         risk = hydrated.get('risk', {})

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1/praetorian_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praetorian-cli
-Version: 2.4.0
+Version: 2.4.1
 Summary: For interacting with the Guard API
 Home-page: https://github.com/praetorian-inc/praetorian-cli
 Author: Praetorian

{praetorian_cli-2.4.0 → praetorian_cli-2.4.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = praetorian-cli
-version = 2.4.0
+version = 2.4.1
 author = Praetorian
 author_email = support@praetorian.com
 description = For interacting with the Guard API