Fix numeric msf options

create_hashes.py

@@ -0,0 +1,16 @@
+from passlib.context import CryptContext
+
+pwd_context = CryptContext(schemes=['argon2'], deprecated='auto')
+
+
+users = {
+    'testuser': 'testuser',
+}
+
+env_content = ''
+print('\nCopy the following lines into your .env file:\n')
+for username, plain_password in users.items():
+    hashed_password = pwd_context.hash(plain_password)
+    env_line = f"USER_{username.upper()}_HASH=\"{hashed_password}\""
+    print(env_line)
+    env_content += env_line + '\n'

docs/source/configuration/command_config.rst

@@ -2,13 +2,15 @@
 cmd_config
 ==========
 
-Stores global variables for command options. These are settings for **all** commands.
+Stores global variables for command options.
+These are settings for **all** commands.
 
 .. code-block:: yaml
 
    ###
    cmd_config:
      loop_sleep: 5
+     command_delay: 0
 
 .. confval:: loop_sleep
 
@@ -19,3 +21,11 @@ Stores global variables for command options. These are settings for **all** comm
 
    :type: int
    :default: 5
+
+.. confval:: command_delay
+
+   This delay in seconds is applied to all commands in the playbook.
+   It is not applied to debug, setvar and sleep commands.
+
+   :type: float
+   :default: 0

docs/source/configuration/index.rst

@@ -25,6 +25,7 @@ sliver and metasploit:
    ###
    cmd_config:
      loop_sleep: 5
+     command_delay: 0
 
    msf_config:
      password: securepassword

docs/source/developing/architecture.rst

@@ -0,0 +1,35 @@
+=======================
+System Architecture (C4)
+=======================
+
+This section presents the architecture of AttackMate using the
+`C4 model <https://c4model.com>`_, a visual framework for describing software architecture across different levels of detail.
+
+C1 – System Context Diagram
+---------------------------
+
+.. image:: ../images/AttackMate-C1.png
+   :width: 80%
+   :alt: System Context Diagram
+
+The System Context diagram shows how **AttackMate** fits into its environment. It illustrates the main user
+(e.g., a pentester or researcher), the software systems it interacts with (e.g., vulnerable target systems, external
+frameworks like Metasploit or Sliver), and the nature of those interactions.
+
+
+C2 – Container Diagram
+----------------------
+
+This diagram shows how AttackMate is internally structured as a modular Python application.
+
+.. image:: ../images/AttackMate-C2.png
+   :alt: Container Diagram
+
+The system is centered around a core orchestration class that receives parsed playbook commands and delegates their
+execution to appropriate components. It separates concerns between parsing, background task management, session handling,
+and command execution, which makes it easy to extend with new command types or external tool integrations.
+
+Future diagrams (e.g., C3 or C4) could describe class-level and code-level structures if needed.
+
+.. note::
+   The official C4 model site (https://c4model.com) provides detailed guidance if you're unfamiliar with this approach.

docs/source/developing/baseexecutor.rst

@@ -6,7 +6,7 @@ Adding a New Executor
 Base Executor
 ================
 
-The ``BaseExecutor`` is the core class from which all executors in AttackMate inherit.  
+The ``BaseExecutor`` is the core class from which all executors in AttackMate inherit.
 It provides a structured approach to implementing custom executors.
 
 Key Features
@@ -64,8 +64,8 @@ Overridable Methods
 
 The following methods can be overridden in custom executors to modify behavior:
 
-**Command Execution**  
-   
+**Command Execution**
+
 .. code-block:: python
 
     def _exec_cmd(self, command: BaseCommand) -> Result:
@@ -74,24 +74,28 @@ The following methods can be overridden in custom executors to modify behavior:
 This is the core execution function and must be implemented in subclasses.
 It should return a ``Result`` object containing the execution outcome.
 
-.. note:: 
+.. note::
 
-    The ``_exec_cmd()`` method **must** be implemented in any subclass of ``BaseExecutor``.  
-    This method defines the core execution logic for the command and is responsible for returning a ``Result`` object.  
+    The ``_exec_cmd()`` method **must** be implemented in any subclass of ``BaseExecutor``.
+    This method defines the core execution logic for the command and is responsible for returning a ``Result`` object.
 
 
-**Logging Functions**  
+**Logging Functions**
 
 The methods ``log_command``, ``log_matadata`` and ``log_json`` log command execution details and can be overridden for custom logging formats.
 
-**Command Execution Flow**  
+**Command Execution Flow**
 
 The ``run()`` method defines the high-level execution flow of a command.
 It includes condition checking, logging, and calling the actual execution logic.
 
-**Output Handling**  
+**Output Handling**
 
 The ``save_output()`` function manages saving output to a file. It can be overridden to implement alternative storage methods.
 
 
+executor __init__.py
+--------------------
+.. note::
 
+    Add the new executor to the ``__all__`` list in the ``__init__.py`` file of the ``attackmate.executors`` module.