stoobly-agent 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.3.0'
+VERSION = '1.4.0'

stoobly_agent/app/api/application_http_request_handler.py

@@ -7,7 +7,7 @@ from mitmproxy.coretypes.multidict import MultiDict
 from urllib.parse import urlparse, parse_qs
 
 from stoobly_agent.app.proxy.replay.body_parser_service import decode_response
-from stoobly_agent.config.constants import headers
+from stoobly_agent.config.constants import custom_headers, headers
 
 from .routes import ROUTES
 from .simple_http_request_handler import SimpleHTTPRequestHandler
@@ -102,11 +102,11 @@ class ApplicationHTTPRequestHandler(SimpleHTTPRequestHandler):
                 'Content-Type',
                 headers.ACCESS_TOKEN.title(),
                 headers.CLIENT.title(),
-                headers.DO_PROXY.title(),
+                custom_headers.DO_PROXY.title(),
                 headers.EXPIRY.title(),
                 headers.PROXY_HEADERS.title(),
                 headers.REQUEST_PATH.title(),
-                headers.SERVICE_URL.title(),
+                custom_headers.SERVICE_URL.title(),
                 headers.TOKEN_TYPE.title(),
                 headers.UID.title(),
             ])

stoobly_agent/app/api/proxy_controller.py

@@ -3,7 +3,8 @@ import requests
 from http.cookies import SimpleCookie
 from urllib3.exceptions import InsecureRequestWarning
 
-from stoobly_agent.config.constants import headers
+from stoobly_agent.app.api.simple_http_request_handler import SimpleHTTPRequestHandler
+from stoobly_agent.config.constants import custom_headers, headers
 from stoobly_agent.config.mitmproxy import MitmproxyConfig
 from stoobly_agent.lib.logger import Logger
 
@@ -46,7 +47,7 @@ class ProxyController:
     def do_PUT(self, context):
         self.__proxy(context, requests.put)
 
-    def __proxy(self, context, method):
+    def __proxy(self, context: SimpleHTTPRequestHandler, method):
         url = self.__get_url(context)
 
         if url:
@@ -110,7 +111,7 @@ class ProxyController:
                 status = status,
             )
 
-    def __get_headers(self, context):
+    def __get_headers(self, context: SimpleHTTPRequestHandler):
         request_headers = dict(context.headers)
 
         headers_white_list = []
@@ -125,12 +126,12 @@ class ProxyController:
 
         return white_listed_headers
 
-    def __get_url(self, context):
-        service_url = context.headers.get(headers.SERVICE_URL)
+    def __get_url(self, context: SimpleHTTPRequestHandler):
+        service_url = context.headers.get(custom_headers.SERVICE_URL)
 
         if not service_url:
             context.render(
-                plain = f"Invalid {headers.SERVICE_URL} header {service_url}",
+                plain = f"Invalid {custom_headers.SERVICE_URL} header {service_url}",
                 status = 400
             )
             return None
@@ -146,7 +147,7 @@ class ProxyController:
 
         return f"{service_url}{request_path}"
 
-    def __get_cookies(self, context):
+    def __get_cookies(self, context: SimpleHTTPRequestHandler):
         return SimpleCookie(context.headers.get('Cookie'))
 
     def __get_body(self, context):

stoobly_agent/app/cli/config_cli.py

@@ -180,7 +180,7 @@ def rewrite(ctx):
 @click.option('--project-key', help='Project to add rewrite rule to.')
 @click.option(
     '--type', 
-    type=click.Choice([request_component.BODY_PARAM, request_component.HEADER, request_component.QUERY_PARAM]), 
+    type=click.Choice([request_component.BODY_PARAM, request_component.HEADER, request_component.QUERY_PARAM, request_component.RESPONSE_HEADER, request_component.RESPONSE_PARAM]), 
     help='Request component type.'
 )
 @click.option(

stoobly_agent/app/cli/helpers/certificate_authority.py

@@ -94,6 +94,9 @@ class CertificateAuthority():
         subprocess.run("sudo update-ca-trust extract".split(), check=True)
 
     def install(self):
+        if not self.certs_generated:
+            self.generate_certs()
+
         distro_name = distro.name(pretty=True)
 
         # Ubuntu or other Debian based
@@ -105,7 +108,9 @@ class CertificateAuthority():
         # elif distro.id() == 'rhel':
         #     return
         else:
-            raise TypeError(f"{distro_name} is not supported yet for automatic CA cert installation.")
+            raise TypeError(
+                f"{distro_name} is not supported yet for automatic installation. For manual installation, see https://docs.mitmproxy.org/stable/concepts-certificates/"
+            )
 
     def sign(self, hostname: str, dest = None, port = 443):
         dest = dest or self.certs_dir

stoobly_agent/app/cli/helpers/print_service.py

@@ -89,6 +89,23 @@ def print_scenarios(scenarios, **kwargs: TabulatePrintOptions):
             select=kwargs.get('select') or []
         )
 
+def print_services(services, **kwargs: TabulatePrintOptions):
+    filter = []
+    format = kwargs.get('format')
+
+    if format == JSON_FORMAT:
+        json_print(services, **{
+            'filter': filter,
+            **kwargs
+        })
+    else:
+        tabulate_print(
+            services, 
+            filter=filter,
+            headers=not kwargs.get('without_headers'),
+            select=kwargs.get('select') or []
+        )
+
 def print_snapshots(snapshots, **kwargs: TabulatePrintOptions):
     filter = ['resource_uuid']
     format = kwargs.get('format')

stoobly_agent/app/cli/scaffold/app.py

@@ -54,8 +54,8 @@ class App():
     return os.path.join(self.context_dir_path, DATA_DIR_NAME)
 
   @property
-  def exists(self):
-    return os.path.exists(self.dir_path)
+  def valid(self):
+    return os.path.exists(self.scaffold_namespace_path)
 
   @property
   def scaffold_namespace(self):

stoobly_agent/app/cli/scaffold/constants.py

@@ -18,8 +18,6 @@ FIXTURES_FOLDER_NAME = 'fixtures'
 NAMESERVERS_FILE = '.nameservers'
 SERVICE_DETACHED = '${SERVICE_DETACHED}'
 SERVICE_DETACHED_ENV = 'SERVICE_DETACHED'
-SERVICE_DOCKER_COMPOSE_PATH = '${SERVICE_DOCKER_COMPOSE_PATH}'
-SERVICE_DOCKER_COMPOSE_PATH_ENV = 'SERVICE_DOCKER_COMPOSE_PATH'
 SERVICE_HOSTNAME = '${SERVICE_HOSTNAME}'
 SERVICE_HOSTNAME_ENV = 'SERVICE_HOSTNAME'
 SERVICE_DNS = '${SERVICE_DNS}'

stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -0,0 +1,112 @@
+import os
+import pdb
+import sys
+
+from dataclasses import dataclass
+from typing import Union
+
+SCAFFOLD_HOSTS_DELIMITTER_BEGIN = "##### STOOBLY SCAFFOLD HOSTS BEGIN #####\n"
+SCAFFOLD_HOSTS_DELIMITTER_END = "##### STOOBLY SCAFFOLD HOSTS END #####\n"
+
+class HostsFileManager():
+
+  @dataclass
+  class IpAddressToHostnames:
+    ip_address: str
+    hostnames: list[str]
+
+  def __get_hosts_file_path(self) -> str:
+    file_path = '/etc/hosts'
+    if not os.path.exists(file_path):
+      print(f"Error: File {file_path} not found.", file=sys.stderr)
+      sys.exit(1)
+    return file_path
+
+  # Split IP address and hostnames. Don't include inline comments
+  def __split_hosts_line(self, line: str) -> list[str]:
+    ip_addr_hosts_split = line.split('#')[0].split()
+    return ip_addr_hosts_split
+
+  # Parses hosts file and returns a mapping of IP address to hostnames in a list.
+  def get_hosts(self) -> list[IpAddressToHostnames]:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    if not hosts_file_path:
+      return []
+
+    with open(hosts_file_path, 'r') as f:
+      hostlines = f.readlines()
+
+    # Skip comments and empty lines
+    hostlines = [line.strip() for line in hostlines
+                 if not line.startswith('#') and line.strip() != '']
+
+    hosts = []
+    for line in hostlines:
+      ip_addr_hosts_split = self.__split_hosts_line(line)
+      ip_address = ip_addr_hosts_split[0]
+      hostnames = ip_addr_hosts_split[1:]
+      ipAddressToHostnames = self.IpAddressToHostnames(ip_address, hostnames)
+
+      hosts.append(ipAddressToHostnames)
+
+    return hosts
+
+  def find_host(self, hostname) -> Union[IpAddressToHostnames, None]:
+    hosts = self.get_hosts()
+
+    for mapping in hosts:
+      if ((mapping.ip_address == '0.0.0.0' or mapping.ip_address == '127.0.0.1') and
+        hostname in mapping.hostnames):
+
+        return mapping
+
+    return None
+
+  def install_hostnames(self, hostnames: list[str]) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.remove_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
+    )
+
+    with open(hosts_file_path, 'a+') as f:
+      if SCAFFOLD_HOSTS_DELIMITTER_BEGIN not in f.read():
+        f.write(SCAFFOLD_HOSTS_DELIMITTER_BEGIN)
+
+      for hostname in hostnames:
+        print(f"Installing hostname {hostname} to {hosts_file_path}")
+        f.write(f"127.0.0.1 {hostname}\n")
+        f.write(f"::1       {hostname}\n")
+
+      if SCAFFOLD_HOSTS_DELIMITTER_END not in f.read():
+        f.write(SCAFFOLD_HOSTS_DELIMITTER_END)
+
+  def uninstall_hostnames(self) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.remove_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
+    ) 
+
+    print(f"Uninstalled hostnames from {hosts_file_path}")
+
+  def remove_lines_between_markers(self, file_path, start_marker, end_marker):
+    with open(file_path, "r") as file:
+      lines = file.readlines()
+    
+    inside_block = False
+    filtered_lines = []
+
+    for line in lines:
+      if start_marker in line:
+        inside_block = True
+        continue  # Skip the start marker line
+      if end_marker in line:
+        inside_block = False
+        continue  # Skip the end marker line
+      if not inside_block:
+        filtered_lines.append(line)
+
+    with open(file_path, "w") as file:
+      file.writelines(filtered_lines)

stoobly_agent/app/cli/scaffold/service.py

@@ -20,6 +20,5 @@ class Service():
   def service_name(self):
     return self.__service_name
 
-  @property
   def workflow_dir_path(self, workflow_name: str):
     return os.path.join(self.dir_path, workflow_name)

stoobly_agent/app/cli/scaffold/service_config.py

@@ -4,7 +4,6 @@ import pdb
 from .config import Config
 from .constants import (
   SERVICE_DETACHED_ENV,
-  SERVICE_DOCKER_COMPOSE_PATH_ENV,
   SERVICE_HOSTNAME_ENV,
   SERVICE_PRIORITY_ENV,
   SERVICE_PORT_ENV,
@@ -18,7 +17,6 @@ class ServiceConfig(Config):
     super().__init__(dir)
 
     self.__detached = None
-    self.__docker_compose_path = None
     self.__hostname = None
     self.__port = None
     self.__priority = None
@@ -53,14 +51,6 @@ class ServiceConfig(Config):
   def detached(self, v):
     self.__detached = v
 
-  @property
-  def docker_compose_path(self):
-    return self.__docker_compose_path
-
-  @docker_compose_path.setter
-  def docker_compose_path(self, v):
-    self.__docker_compose_path = v
-
   @property
   def hostname(self):
     return (self.__hostname or '').strip()
@@ -120,19 +110,25 @@ class ServiceConfig(Config):
     config = config or self.read()
 
     self.detached = config.get(SERVICE_DETACHED_ENV)
-    self.docker_compose_path = config.get(SERVICE_DOCKER_COMPOSE_PATH_ENV)
     self.hostname = config.get(SERVICE_HOSTNAME_ENV)
     self.port = config.get(SERVICE_PORT_ENV)
     self.priority = config.get(SERVICE_PRIORITY_ENV)
     self.proxy_mode = config.get(SERVICE_PROXY_MODE_ENV)
     self.scheme = config.get(SERVICE_SCHEME_ENV)
 
+  def to_dict(self):
+    return {
+      'detached': self.detached,
+      'hostname': self.hostname,
+      'port': self.port,
+      'priority': self.priority,
+      'proxy_mode': self.proxy_mode,
+      'scheme': self.scheme,
+    }
+
   def write(self):
     config = {}
 
-    if self.docker_compose_path:
-      config[SERVICE_DOCKER_COMPOSE_PATH_ENV] = self.docker_compose_path
-
     if self.hostname:
       config[SERVICE_HOSTNAME_ENV] = self.hostname
 

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -18,7 +18,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
-from stoobly_agent.app.cli.scaffold.hosts_file_reader import HostsFileReader
+from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
 from stoobly_agent.app.cli.scaffold.validate_command import ValidateCommand
@@ -89,8 +89,8 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   def hostname_exists(self, hostname: str) -> bool:
     print(f"Validating hostname exists in hosts file for hostname: {hostname}")
 
-    hosts_file_reader = HostsFileReader()
-    host_mapping = hosts_file_reader.find_host(hostname)
+    hosts_file_manager = HostsFileManager()
+    host_mapping = hosts_file_manager.find_host(hostname)
     if host_mapping:
       print(f"Correct hosts mapping found for {hostname}")
       return True

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -1,4 +1,4 @@
-FROM stoobly/agent:1.3
+FROM stoobly/agent:1.4
 
 ARG USER_ID
 

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -4,7 +4,7 @@
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored
 # STOOBLY_CERTS_DIR: path to a folder to store certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
-# STOOBLY_WORKFLOW_OPTIONS: extra options to pass to 'stoobly-agent scaffold workflow' commands
+# STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass  'stoobly-agent scaffold workflow' commands
 
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -24,7 +24,7 @@ context_dir_option=--context-dir-path $(context_dir)
 user_id_option=--user-id $(USER_ID)
 stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
 workflow_down_options=$(user_id_option)
-workflow_options=$${STOOBLY_WORKFLOW_OPTIONS:+$$STOOBLY_WORKFLOW_OPTIONS }
+workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 workflow_up_options=$(context_dir_option) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --from-make $(user_id_option)
 
 app_data_dir=$(app_dir)/.stoobly
@@ -60,9 +60,16 @@ stoobly_exec_run_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(app_d
 # Workflow run
 workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
+ca-cert/install: stoobly/install
+	@echo "Running stoobly-agent ca-cert install..."; \
+	stoobly-agent ca-cert install
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
 	$(stoobly_exec)
+command/install:
+	$(eval COMMAND=install)
+command/uninstall:
+	$(eval COMMAND=uninstall)
 nameservers: tmpdir
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
@@ -72,7 +79,8 @@ nameservers: tmpdir
 		fi; \
 		echo "$$nameserver" > $(app_tmp_dir)/.nameservers; \
 	else \
-		echo "/etc/resolv.conf not found."; \
+		echo "/etc/resolv.conf not found." >&2; \
+		exit 1; \
 	fi
 intercept/disable:
 	@export EXEC_COMMAND=bin/.disable && \
@@ -81,42 +89,24 @@ intercept/enable:
 	@export EXEC_COMMAND=bin/.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: nameservers
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-mock/logs: 
-	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-mock/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record: nameservers
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record/logs: 
-	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+mock: workflow/mock workflow/hostname/install nameservers workflow/up
+mock/services: workflow/mock workflow/services
+mock/logs: workflow/mock workflow/logs
+mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+pipx/install:
+	@if ! command -v pipx >/dev/null 2>&1; then \
+		echo "pipx is not installed. Installing pipx..."; \
+		python3 -m pip install --user pipx && python3 -m pipx ensurepath; \
+	fi
+python/validate:
+	@if ! python3 --version | grep -Eq 'Python 3\.(10|11|12)'; then \
+		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
+		exit 1; \
+	fi
+record: workflow/record workflow/hostname/install nameservers workflow/up
+record/down: workflow/record workflow/down workflow/hostname/uninstall
+record/services: workflow/record workflow/services
+record/logs: workflow/record workflow/logs
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=bin/.create && \
@@ -146,23 +136,57 @@ scenario/snapshot:
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
-test:
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+stoobly/install: python/validate pipx/install 
+	@if ! pipx list 2> /dev/null | grep -q 'stoobly-agent'; then \
+		echo "stoobly-agent not found. Installing..."; \
+		pipx install stoobly-agent; \
+	fi
+test: workflow/test workflow/up
+test/services: workflow/test workflow/services
+test/logs: workflow/test workflow/logs
+test/down: workflow/test workflow/down
+tmpdir:
+	@mkdir -p $(app_tmp_dir)
+workflow/down:
+	@export EXEC_COMMAND=bin/.down && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
-test/logs: 
+workflow/hostname: stoobly/install
+	@read -p "Do you want to $(COMMAND) hostname(s) in /etc/hosts? (y/N) " confirm && \
+	if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
+		CURRENT_VERSION=$$(stoobly-agent --version); \
+		REQUIRED_VERSION="1.4.0"; \
+		if [ "$$(printf '%s\n' "$$REQUIRED_VERSION" "$$CURRENT_VERSION" | sort -V | tail -n 1)" = "$$CURRENT_VERSION" ]; then \
+			echo "stoobly-agent version $$REQUIRED_VERSION required. Please run: pipx upgrade stoobly-agent"; \
+			exit 1; \
+		fi; \
+		echo "Running stoobly-agent scaffold hostname $(COMMAND)..."; \
+		stoobly-agent scaffold hostname $(COMMAND) --app-dir-path $(app_dir) --workflow $(WORKFLOW); \
+	fi
+workflow/hostname/install: command/install workflow/hostname
+workflow/hostname/uninstall: command/uninstall workflow/hostname  
+workflow/logs:
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
-test/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+workflow/mock:
+	$(eval WORKFLOW=mock)
+workflow/record:
+	$(eval WORKFLOW=record)
+workflow/services:
+	@export EXEC_COMMAND=bin/.services && \
+	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
+	$(stoobly_exec_run)
+workflow/test:
+	$(eval WORKFLOW=test)
+workflow/up:
+	@export EXEC_COMMAND=bin/.up && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
-	$(workflow_run)
-tmpdir:
-	@mkdir -p $(app_tmp_dir)
+	$(workflow_run)

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.services

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+extra_options=$EXEC_OPTIONS
+workflow=$1
+
+stoobly-agent scaffold service list \
+  --app-dir-path "$(pwd)" \
+  --workflow $workflow \
+  $extra_options

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -17,7 +17,6 @@ CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 
 class BuildOptions(TypedDict):
   builder_class: type 
-  headless: bool
   service_builder: ServiceBuilder
   template: WORKFLOW_TEMPLATE
   workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]]

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -29,10 +29,12 @@ class BuildOptions(ComposeOptions):
   verbose: bool
 
 class DownOptions(ComposeOptions):
+  extra_compose_path: str
   rmi: bool
 
 class UpOptions(ComposeOptions):
   attached: bool
+  extra_compose_path: str
   pull: bool
 
 class WorkflowRunCommand(WorkflowCommand):
@@ -43,7 +45,6 @@ class WorkflowRunCommand(WorkflowCommand):
     self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or app.ca_certs_dir_path
     self.__certs_dir_path = kwargs.get('certs_dir_path') or app.certs_dir_path
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
-    self.__extra_compose_path = kwargs.get('extra_compose_path')
     self.__network = kwargs.get('network') or self.app_config.network
 
   @property
@@ -70,10 +71,6 @@ class WorkflowRunCommand(WorkflowCommand):
   def current_working_dir(self, v):
     self.__current_working_dir = v
 
-  @property
-  def extra_compose_path(self):
-    return self.__extra_compose_path
-
   @property
   def nameservers(self):
     path = self.nameservers_path
@@ -153,8 +150,8 @@ class WorkflowRunCommand(WorkflowCommand):
 
       command_options.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
 
-    if self.extra_compose_path:
-      command_options.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
+    if options.get('extra_compose_path'):
+      command_options.append(f"-f {os.path.relpath(options['extra_compose_path'], self.__current_working_dir)}")
 
     command_options.append(f"--profile {self.workflow_name}") 
 
@@ -203,8 +200,8 @@ class WorkflowRunCommand(WorkflowCommand):
     if self.custom_services:
       command.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
 
-    if self.extra_compose_path:
-      command.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
+    if options.get('extra_compose_path'):
+      command.append(f"-f {os.path.relpath(options['extra_compose_path'], self.__current_working_dir)}")
 
     command.append(f"--profile {self.workflow_name}")