ait-testbed · thorinaboenke · Jun 18, 2026 · May 29, 2026 · May 29, 2026 · May 29, 2026
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -7,15 +7,33 @@ about: If something isn't working 🔧
 Describe your issue here.
 
 ### Your environment
-* Version of ruby
-* Docker or manual installation?
-* Which browser and its version
+* Version of AttackMate (`attackmate --version`)
+* Python version (`python --version`)
+* Ansible, Docker, pip, or uv installation?
+* OS and version
 
 ### Steps to reproduce
-Tell us how to reproduce this issue. 
+Tell us how to reproduce this issue.
+
+### Playbook
+Provide a minimal playbook that reproduces the issue (remove sensitive data):
+
+```yaml
+
+```
+
+### Config
+Provide the config you used.
+
+```yaml
+
+```
 
 ### Expected behaviour
 Tell us what should happen
 
 ### Actual behaviour
 Tell us what happens instead
+
+### Log output
+Paste the relevant log output or error/stack trace here:
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.md b/.github/ISSUE_TEMPLATE/02_feature_request.md
@@ -5,7 +5,7 @@ about: If you have a feature request 💡
 
 **Context**
 
-What are you trying to do and how would you want to do it differently? Is it something you currently you cannot do? Is this related to an issue/problem?
+What are you trying to do and how would you want to do it differently? Is it something you currently cannot do? Is this related to an issue/problem?
 
 **Alternatives**
 
@@ -18,4 +18,3 @@ Please provide a link to the issue.
 **If the feature request is approved, would you be willing to submit a PR?**
 
 Yes / No _(Help can be provided if you need assistance submitting a PR)_
-
diff --git a/docs/source/configuration/command_config.rst b/docs/source/configuration/command_config.rst
@@ -10,6 +10,9 @@ These are settings for **all** commands.
    cmd_config:
      loop_sleep: 5
      command_delay: 0
+     command_delay_jitter: false
+     command_delay_jitter_min: 0.5
+     command_delay_jitter_max: 2.0
 
 .. confval:: loop_sleep
 
@@ -27,3 +30,29 @@ These are settings for **all** commands.
 
    :type: float
    :default: 0
+
+.. confval:: command_delay_jitter
+
+   When ``true``, randomizes the per-command delay. The effective delay is calculated as
+   ``command_delay ± random(command_delay_jitter_min, command_delay_jitter_max)``,
+   clamped to a minimum of ``0``. Has no effect when ``command_delay_jitter``
+   is ``false``.
+
+   :type: bool
+   :default: false
+
+.. confval:: command_delay_jitter_min
+
+   Lower bound of the jitter offset in seconds. Only used when
+   :confval:`command_delay_jitter` is ``true``.
+
+   :type: float
+   :default: 0.5
+
+.. confval:: command_delay_jitter_max
+
+   Upper bound of the jitter offset in seconds. Only used when
+   :confval:`command_delay_jitter` is ``true``.
+
+   :type: float
+   :default: 2.0
diff --git a/docs/source/configuration/index.rst b/docs/source/configuration/index.rst
@@ -26,7 +26,10 @@ sliver, metasploit and remote attackmate server:
 
    cmd_config:
      loop_sleep: 5
-     command_delay: 0
+     command_delay: 1
+     command_delay_jitter: true
+     command_delay_jitter_min: 0.5
+     command_delay_jitter_max: 2.0
 
    bettercap_config:
      default:
@@ -35,11 +38,13 @@ sliver, metasploit and remote attackmate server:
        password: password
 
    msf_config:
-     password: securepassword
-     server: 127.0.0.1
+     default:
+       password: securepassword
+       server: 127.0.0.1
 
    sliver_config:
-     config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
+     default:
+       config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
 
    remote_config:
      remote_server_name:

diff --git a/docs/source/configuration/msf_config.rst b/docs/source/configuration/msf_config.rst
@@ -4,13 +4,40 @@
 msf_config
 ==========
 
-``msf_config`` holds connection settings for the Metasploit RPC daemon (``msfrpcd``).
+``msf_config`` holds connection settings for one or more Metasploit RPC daemon (``msfrpcd``)
+instances. Each connection is identified by a name. The first defined connection is used by
+default when a command does not specify one explicitly.
 
 .. code-block:: yaml
 
    msf_config:
-     password: securepassword
-     server: 10.18.3.86
+     primary:
+       password: securepassword
+       server: 10.18.3.86
+
+Multiple servers can be defined and selected per command via the :confval:`connection` field:
+
+.. code-block:: yaml
+
+   msf_config:
+     server1:
+       password: securepassword
+       server: 10.18.3.86
+     server2:
+       password: anothersecret
+       server: 10.18.3.87
+
+.. note::
+
+   **Backwards compatibility:** The legacy single-server format is still accepted and is
+   automatically migrated to a named entry called ``default``:
+
+   .. code-block:: yaml
+
+      # Legacy format (still supported)
+      msf_config:
+        password: securepassword
+        server: 10.18.3.86
 
 
 .. confval:: server

diff --git a/docs/source/configuration/sliver_config.rst b/docs/source/configuration/sliver_config.rst
@@ -4,12 +4,37 @@
 sliver_config
 =============
 
-``sliver_config`` stores all settings to control the connection to the Sliver API.
+``sliver_config`` stores connection settings for one or more Sliver C2 servers.
+Each connection is identified by a name. The first defined connection is used by
+default when a command does not specify one explicitly.
 
 .. code-block:: yaml
 
    sliver_config:
-     config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
+     primary:
+       config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
+
+Multiple servers can be defined and selected per command via the :confval:`connection` field:
+
+.. code-block:: yaml
+
+   sliver_config:
+     sliver_server1:
+       config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
+     sliver_server2:
+       config_file: /home/attacker/.sliver-client/configs/attacker2_localhost.cfg
+
+.. note::
+
+   **Backwards compatibility:** The legacy single-server format is still accepted and is
+   automatically migrated to a named entry called ``default``:
+
+   .. code-block:: yaml
+
+      # Legacy format (still supported)
+      sliver_config:
+        config_file: /home/attacker/.sliver-client/configs/attacker_localhost.cfg
+
 
 .. confval:: config_file
 

diff --git a/docs/source/developing/command.rst b/docs/source/developing/command.rst
@@ -110,7 +110,7 @@ The factory filters the provided configurations based on the class constructor s
             'pm': self.pm,
             'varstore': self.varstore,
             'cmdconfig': self.pyconfig.cmd_config,
-            'msfconfig': self.pyconfig.msf_config,
+            'msf_config': self.pyconfig.msf_config,
             'msfsessionstore': self.msfsessionstore,
             'sliver_config': self.pyconfig.sliver_config,
             'runfunc': self._run_commands,

diff --git a/docs/source/developing/integration.rst b/docs/source/developing/integration.rst
@@ -247,11 +247,11 @@ Top-level configuration object. All fields have safe defaults, so an empty
      - ``CommandConfig``
      - Global command execution settings. See below.
    * - ``msf_config``
-     - ``MsfConfig``
-     - Metasploit RPC connection settings. See below.
+     - ``dict[str, MsfConfig]``
+     - Named Metasploit RPC connections. See below.
    * - ``sliver_config``
-     - ``SliverConfig``
-     - Sliver C2 connection settings. See below.
+     - ``dict[str, SliverConfig]``
+     - Named Sliver C2 connections. See below.
    * - ``bettercap_config``
      - ``dict[str, BettercapConfig]``
      - Named Bettercap instances. Keys are referenced by ``webserv`` commands.
@@ -440,7 +440,7 @@ Running a Single Command
         initialize_logger(debug=False, append_logs=False)
 
         config = Config(
-            msf_config={"password": "your_password", "ssl": True, "port": 55553},
+            msf_config={"default": {"password": "your_password", "ssl": True, "port": 55553}},
             cmd_config={"loop_sleep": 10},
         )
         varstore = {"HOST": "10.0.0.1"}

diff --git a/docs/source/playbook/commands/msf-module.rst b/docs/source/playbook/commands/msf-module.rst
@@ -89,7 +89,14 @@ Most exploit modules do not produce direct output but instead open a session
 
    :type: str
 
-   The following example illustrates the use of sessions and payloads:
+.. confval:: connection
+
+   Name of the MSF server connection to use, as defined in :ref:`msf_config`.
+   If omitted, the first configured connection is used.
+
+   :type: str
+
+The following example illustrates the use of sessions and payloads:
 
 .. code-block:: yaml
 

diff --git a/docs/source/playbook/commands/msf-session.rst b/docs/source/playbook/commands/msf-session.rst
@@ -78,3 +78,10 @@ Execute commands in an active Meterpreter session previously opened by an
    String indicating the end of a read-operation.
 
    :type: str
+
+.. confval:: connection
+
+   Name of the MSF server connection to use, as defined in :ref:`msf_config`.
+   If omitted, the first configured connection is used.
+
+   :type: str
diff --git a/docs/source/playbook/commands/payload.rst b/docs/source/playbook/commands/payload.rst
@@ -100,3 +100,10 @@ Generate a Metasploit payload and save it to a file.
 
    :type: int
    :default: ``0``
+
+.. confval:: connection
+
+   Name of the MSF server connection to use, as defined in :ref:`msf_config`.
+   If omitted, the first configured connection is used.
+
+   :type: str
diff --git a/docs/source/playbook/commands/sliver-session.rst b/docs/source/playbook/commands/sliver-session.rst
@@ -9,6 +9,8 @@ Execute commands within an active Sliver implant session. All commands require a
 
 .. note::
 
+   To configure the connection to the Sliver server, see :ref:`sliver_config`.
+
    **For developers:** The ``sliver`` and ``sliver-session`` command families use a legacy
    ``type`` + ``cmd`` discrimination pattern and should not be replicated. New commands
    must define a unique ``type`` literal and handle sub-behavior branching via ``cmd``
@@ -22,6 +24,13 @@ Execute commands within an active Sliver implant session. All commands require a
    :type: str
    :required: True
 
+.. confval:: connection
+
+   Name of the Sliver server connection to use, as defined in :ref:`sliver_config`.
+   If omitted, the first configured connection is used.
+
+   :type: str
+
 File System
 -----------
 

diff --git a/docs/source/playbook/commands/sliver.rst b/docs/source/playbook/commands/sliver.rst
@@ -8,11 +8,20 @@ Control the Sliver C2 server via its API. All commands use ``type: sliver``.
 
 .. note::
 
+   To configure the connection to the Sliver server, see :ref:`sliver_config`.
+
    **For developers:** The ``sliver`` and ``sliver-session`` command families use a legacy
    ``type`` + ``cmd`` discrimination pattern and should not be replicated. New commands
    must define a unique ``type`` literal and handle sub-behavior branching via ``cmd``
    in the executor. See :ref:`command` for details.
 
+.. confval:: connection
+
+   Name of the Sliver server connection to use, as defined in :ref:`sliver_config`.
+   If omitted, the first configured connection is used.
+
+   :type: str
+
 start_https_listener
 --------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,12 +28,13 @@ dependencies = [
     "dotenv",
     "passlib",
     "python-multipart",
-    "attackmate-client @ git+https://github.com/ait-testbed/attackmate-client.git",
+    "attackmate-client>=0.1.2",
 ]
 dynamic = ["version"]
 
 [project.scripts]
 attackmate = "attackmate.__main__:main"
+attackm8 = "attackmate.__main__:main"
 
 [build-system]
 requires = ["setuptools>=61.0.0", "wheel"]