stoobly-agent 1.10.3__py3-none-any.whl → 1.10.5__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.10.3'
+VERSION = '1.10.5'

stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -12,7 +12,7 @@ from .app import App
 from .app_command import AppCommand
 from .constants import PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT, RUN_ON_DOCKER, RUN_ON_LOCAL
 from .docker.template_files import plugin_docker_cypress, plugin_docker_playwright, plugin_local_cypress, plugin_local_playwright, remove_app_docker_files, remove_service_docker_files
-from .templates.constants import CORE_GATEWAY_SERVICE_NAME, CORE_MOCK_UI_SERVICE_NAME, MAINTAINED_RUN
+from .templates.constants import CORE_GATEWAY_SERVICE_NAME, CORE_MOCK_UI_SERVICE_NAME, CUSTOM_RUN, MAINTAINED_RUN
 
 class AppCreateOptions(TypedDict):
   docker_socket_path: str
@@ -85,6 +85,7 @@ class AppCreateCommand(AppCommand):
             ignore.append(f"{CORE_MOCK_UI_SERVICE_NAME}/.*")
 
         if RUN_ON_DOCKER in self.app_run_on:
+            ignore.append(f".*/{CUSTOM_RUN}")
             ignore.append(f".*/{MAINTAINED_RUN}")
 
         # Copy all app templates

stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py

@@ -2,12 +2,14 @@ import os
 import pdb
 import subprocess
 import sys
+import time
 
 from typing import List
+from types import FunctionType
 
 from stoobly_agent.app.cli.scaffold.docker.constants import APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
 from stoobly_agent.app.cli.scaffold.docker.service.configure_gateway import configure_gateway
-from stoobly_agent.app.cli.scaffold.templates.constants import CORE_ENTRYPOINT_SERVICE_NAME
+from stoobly_agent.app.cli.scaffold.templates.constants import CORE_ENTRYPOINT_SERVICE_NAME, CORE_SERVICES
 from stoobly_agent.app.cli.scaffold.workflow import Workflow
 from stoobly_agent.app.cli.scaffold.workflow_run_command import WorkflowRunCommand
 from stoobly_agent.app.cli.types.workflow_run_command import BuildOptions, DownOptions, UpOptions, WorkflowDownOptions, WorkflowUpOptions, WorkflowLogsOptions
@@ -27,10 +29,14 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     self.services = services or []
     self.script = script
 
+  @property
+  def timestamp_file_extension(self):
+    return '.timestamp'
+
   @property
   def timestamp_file_path(self):
     """Get the path to the timestamp file for this workflow."""
-    return os.path.join(self.workflow_namespace.path, f"{self.workflow_name}.timestamp")
+    return os.path.join(self.workflow_namespace.path, self.timestamp_file_name(self.workflow_name))
 
   def exec_setup(self, containerized=False, user_id=None, verbose=False):
     """Setup Docker environment including gateway, images, and networks."""
@@ -47,25 +53,22 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     
     for command in init_commands:
       self.exec(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    
+
+  def timestamp_file_name(self, workflow_name: str):
+    return f"{workflow_name}{self.timestamp_file_extension}"
+
   def up(self, **options: WorkflowUpOptions):
     """Execute the complete Docker workflow up process."""
-    # Define timestamp file path
-    timestamp_file = self.timestamp_file_path
-    
-    # Create timestamp file to indicate workflow is starting
-    try:
-      with open(timestamp_file, 'w') as f:
-        import time
-        f.write(str(time.time()))
-      Logger.instance(LOG_ID).info(f"Created timestamp file: {timestamp_file}")
-    except Exception as e:
-      Logger.instance(LOG_ID).error(f"Failed to create timestamp file: {e}")
-      sys.exit(1)
-    
+
     no_publish = options.get('no_publish', False)
     print_service_header = options.get('print_service_header')
-    
+    timestamp_file = None
+
+    if not self.dry_run:
+      self.__iterate_active_workflows(handle_active=self.__handle_up_active)
+
+      timestamp_file = self.__create_timestamp_file()
+
     try:
       # Create individual service commands
       commands: List[DockerWorkflowRunCommand] = []
@@ -117,22 +120,17 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
           self.exec(exec_command)
     
     except Exception as e:
-      # Clean up timestamp file on error
-      if os.path.exists(timestamp_file):
-        try:
-          os.remove(timestamp_file)
-          Logger.instance(LOG_ID).info(f"Removed timestamp file due to error: {timestamp_file}")
-        except Exception as cleanup_error:
-          Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file after error: {cleanup_error}")
+      if timestamp_file:
+        # Clean up timestamp file on error
+        self.__remove_timestamp_file(timestamp_file) 
       raise e
 
   def down(self, **options: WorkflowDownOptions):
     """Execute the complete Docker workflow down process."""
-    # Check if workflow is running (timestamp file exists)
-    timestamp_file = self.timestamp_file_path
-    if not os.path.exists(timestamp_file):
-      Logger.instance(LOG_ID).info(f"Workflow '{self.workflow_name}' is not running. No timestamp file found: {timestamp_file}")
-      return
+
+    timestamp_file = None
+    if not self.dry_run: 
+      timestamp_file = self.__find_and_verify_timestamp_file()
     
     print_service_header = options.get('print_service_header')
     
@@ -186,25 +184,16 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
       remove_ingress_network_command = command.remove_ingress_network()
       if remove_ingress_network_command:
         self.exec(remove_ingress_network_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    
-    # Clean up timestamp file
-    timestamp_file = os.path.join(self.workflow_namespace.path, f"{self.workflow_name}.timestamp")
-    if os.path.exists(timestamp_file):
-      try:
-        os.remove(timestamp_file)
-      except Exception as e:
-        Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file: {e}")
+
+    if timestamp_file:
+      self.__remove_timestamp_file(timestamp_file)
 
   def logs(self, **options: WorkflowLogsOptions):
     """Execute the complete Docker workflow logs process."""
-    # Check if workflow is running (timestamp file exists)
-    timestamp_file = self.timestamp_file_path
-    if not os.path.exists(timestamp_file):
-      Logger.instance(LOG_ID).info(f"Workflow '{self.workflow_name}' is not running. No timestamp file found: {timestamp_file}")
-      return
-    
-    from ...templates.constants import CORE_SERVICES
-    
+
+    if not self.dry_run:
+      self.__find_and_verify_timestamp_file()
+     
     print_service_header = options.get('print_service_header')
     
     # Filter services based on options
@@ -414,10 +403,92 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     if self.script:
       print(command, file=self.script)
 
-    if self.dry_run:
+    if self.dry_run or self.containerized:
       print(command)
     else:
       result = subprocess.run(command, shell=True, **options)
       if result.returncode != 0:
         Logger.instance(LOG_ID).error(command)
-        sys.exit(1)
+        sys.exit(1)
+
+  def __find_and_verify_timestamp_file(self):
+    # Check if workflow is running (timestamp file exists)
+
+    timestamp_file = self.timestamp_file_path
+
+    if not os.path.exists(timestamp_file):
+      Logger.instance(LOG_ID).error(f"Workflow '{self.workflow_name}' is not running.")
+
+      if self.workflow_name != self.workflow_namespace.namespace:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow up {self.workflow_name} --namespace {self.workflow_namespace.namespace}` to start it first.")
+      else:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow up {self.workflow_name}` to start it first.")
+      sys.exit(2)
+
+    return timestamp_file
+
+  def __handle_up_active(self, folder: str, timestamp_file_path: str):
+    file_name = os.path.basename(timestamp_file_path)
+
+    # In the case of a namespace, the workflow name is the name of the file without the timestamp extension
+    workflow_name = self.workflow_name
+    if folder != self.workflow_name:
+      workflow_name = file_name.split(self.timestamp_file_extension)[0]
+
+    Logger.instance(LOG_ID).error(f"Workflow '{workflow_name}' is running, please stop it first.")
+
+    if folder != workflow_name:
+      Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow down {workflow_name} --namespace {folder}` to stop it first.")
+    else:
+      Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow down {workflow_name}` to stop it first.")
+
+    sys.exit(1)
+
+  def __iterate_active_workflows(self, **kwargs):
+    handle_active: FunctionType = kwargs.get('handle_active')
+    tmp_dir_path = self.app.data_dir.tmp_dir_path
+
+    # For each folder in self.app.data_dir.tmp_dir_path
+    for folder in os.listdir(tmp_dir_path):
+      folder_path = os.path.join(tmp_dir_path, folder)
+
+      # If the folder is not a directory, skip
+      if not os.path.isdir(folder_path):
+        continue
+
+      # For each file in folder_path that ends with .timestamp
+      for file in os.listdir(folder_path):
+        if not file.endswith(self.timestamp_file_extension):
+          continue
+
+        # If the folder contains a .timestamp file, then another workflow is running
+        timestamp_file_path = os.path.join(folder_path, file)
+
+        # Allow re-running the same workflow
+        if timestamp_file_path == self.timestamp_file_path:
+          continue
+
+        if handle_active:
+          handle_active(folder, timestamp_file_path)
+
+  def __create_timestamp_file(self):
+    # Create timestamp file to indicate workflow is starting
+    timestamp_file = self.timestamp_file_path
+
+    try:
+      with open(timestamp_file, 'w') as f:
+        f.write(str(time.time()))
+      Logger.instance(LOG_ID).debug(f"Created timestamp file: {timestamp_file}")
+    except Exception as e:
+      Logger.instance(LOG_ID).error(f"Failed to create timestamp file: {e}")
+      sys.exit(1)
+    
+    return timestamp_file
+
+  def __remove_timestamp_file(self, timestamp_file: str):
+    # Clean up timestamp file
+    if os.path.exists(timestamp_file):
+      try:
+        os.remove(timestamp_file)
+      except Exception as e:
+        Logger.instance(LOG_ID).warning(f"Failed to remove timestamp file: {e}")

stoobly_agent/app/cli/scaffold/local/workflow/run_command.py

@@ -3,7 +3,9 @@ import pdb
 import signal
 import subprocess
 import sys
+import time
 
+from types import FunctionType
 from typing import Optional, List
 
 from stoobly_agent.app.cli.scaffold.constants import PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT
@@ -34,26 +36,28 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
       self._log_file_path = os.path.join(self.workflow_namespace.path, f"{self.workflow_name}.log")
     return self._log_file_path
 
+  @property
+  def pid_file_extension(self):
+    return '.pid'
+
   @property
   def pid_file_path(self):
     """Get the path to the PID file for this workflow."""
     if not self._pid_file_path:
-      self._pid_file_path = os.path.join(self.workflow_namespace.path, f"{self.workflow_name}.pid")
+      self._pid_file_path = os.path.join(self.workflow_namespace.path, self.pid_file_name(self.workflow_name))
     return self._pid_file_path
 
-  def _write_pid(self, pid: int):
-    """Write the process PID to the PID file."""
-    os.makedirs(os.path.dirname(self.pid_file_path), exist_ok=True)
-    with open(self.pid_file_path, 'w') as f:
-      f.write(str(pid))
+  def pid_file_name(self, workflow_name: str):
+    return f"{workflow_name}{self.pid_file_extension}"
 
-  def _read_pid(self) -> Optional[int]:
+  def _read_pid(self, file_path = None) -> Optional[int]:
     """Read the process PID from the PID file."""
-    if not os.path.exists(self.pid_file_path):
+    file_path = file_path or self.pid_file_path
+    if not os.path.exists(file_path):
       return None
     
     try:
-      with open(self.pid_file_path, 'r') as f:
+      with open(file_path, 'r') as f:
         return int(f.read().strip())
     except (ValueError, IOError):
       return None
@@ -130,9 +134,12 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     """Start the workflow using local stoobly-agent run."""
     detached = options.get('detached', False)
 
-    commands = self.workflow_service_commands(**options)
+    if not self.dry_run:
+      self.__iterate_active_workflows(handle_active=self.__handle_up_active, handle_stale=self.__handle_up_stale)
 
     # iterate through each service in the workflow
+    commands = self.workflow_service_commands(**options)
+
     public_directory_paths = []
     response_fixtures_paths = []
     for command in commands:
@@ -145,18 +152,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
         if os.path.exists(command.response_fixtures_path):
           response_fixtures_paths.append('--response-fixtures-path')
           response_fixtures_paths.append(f"{command.response_fixtures_path}:{url}")
-    
-    # Check if PID file already exists
-    if os.path.exists(self.pid_file_path):
-      pid = self._read_pid()
-      if pid and self._is_process_running(pid):
-        Logger.instance(LOG_ID).error(f"Workflow {self.workflow_name} is already running with PID: {pid}")
-        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow down {self.workflow_name}` to stop it first")
-        sys.exit(1)
-      else:
-        # PID file exists but process is not running, clean it up
-        os.remove(self.pid_file_path)
-
+   
     for command in commands:
       command.service_up(**options)
 
@@ -166,17 +162,10 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
 
   def down(self, **options: WorkflowDownOptions):
     """Stop the workflow by killing the local process."""
-    
-    pid = self._read_pid()
+
+    # Intentially run this during dry run, we need the PID to be returned
+    pid = self.__find_and_verify_workflow_pid()
     if not pid:
-      Logger.instance(LOG_ID).warning(f"No PID file found for {self.workflow_name}")
-      return
-    
-    if not self._is_process_running(pid):
-      Logger.instance(LOG_ID).info(f"Process {pid} for {self.workflow_name} is not running")
-      # Clean up PID file
-      if os.path.exists(self.pid_file_path):
-        os.remove(self.pid_file_path)
       return
     
     # Kill the process
@@ -212,8 +201,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
           Logger.instance(LOG_ID).info(f"Successfully stopped process {pid} for {self.workflow_name}")
         
         # Clean up PID file
-        if os.path.exists(self.pid_file_path):
-          os.remove(self.pid_file_path)
+        self.__remove_pid_file()
           
       except Exception as e:
         Logger.instance(LOG_ID).error(f"Failed to stop {self.workflow_name}: {e}")
@@ -221,11 +209,9 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
   def logs(self, **options: WorkflowLogsOptions):
     """Show logs for the local workflow process."""
     follow = options.get('follow', False)
-    
-    pid = self._read_pid()
-    if not pid:
-      Logger.instance(LOG_ID).warning(f"No PID file found for {self.workflow_name}")
-      return
+
+    if not self.dry_run:
+      self.__find_and_verify_workflow_pid()
     
     # Build log command
     log_file = f"{self.log_file_path}"
@@ -243,22 +229,17 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
       except subprocess.CalledProcessError as e:
         Logger.instance(LOG_ID).error(f"Failed to show logs for {self.workflow_name}: {e}")
 
-  def status(self):
-    """Check the status of the local workflow process."""
-    pid = self._read_pid()
-    if not pid:
-      return "not running"
-    
-    if self._is_process_running(pid):
-      return f"running (PID: {pid})"
-    else:
-      return "not running (stale PID file)"
-
   def workflow_service_commands(self, **options: WorkflowUpOptions):
     commands = list(map(lambda service_name: LocalWorkflowRunCommand(self.app, service_name=service_name, **options), self.services))
     commands.sort(key=lambda command: command.service_config.priority)
     return commands
 
+  def __create_pid_file(self, pid: int):
+    """Write the process PID to the PID file."""
+    os.makedirs(os.path.dirname(self.pid_file_path), exist_ok=True)
+    with open(self.pid_file_path, 'w') as f:
+      f.write(str(pid))
+
   def __dry_run_down(self, pid: int, output_file: str):
     print(f"# Stop {self.workflow_name} (PID: {pid})", file=output_file)
     print(f"kill {pid} || true", file=output_file)
@@ -273,6 +254,83 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     else:
       print(f"cat {log_file}", file=output_file)
 
+  def __find_and_verify_workflow_pid(self):
+    # Find and verify the workflow PID
+    pid = self._read_pid()
+
+    if not pid:
+      Logger.instance(LOG_ID).error(f"Workflow {self.workflow_name} is not running.")
+
+      # If the workflow name does not match the workflow namespace, then recommend with --namespace option
+      if self.workflow_name != self.workflow_namespace.namespace:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow up {self.workflow_name} --namespace {self.workflow_namespace.namespace}` to start it first.")
+      else:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow up {self.workflow_name}` to start it first.")
+
+      sys.exit(1)
+    
+    if not self._is_process_running(pid):
+      Logger.instance(LOG_ID).info(f"Process {pid} for {self.workflow_name} is not running")
+      # Clean up PID file
+      return self.__remove_pid_file()
+
+    return pid
+
+  def __handle_up_active(self, folder: str, pid: str, pid_file_path: str):
+    # Allow re-running the same workflow, bring workflow down first
+    if pid_file_path == self.pid_file_path and os.path.exists(pid_file_path):
+      self.down()
+    else:
+      file_name = os.path.basename(pid_file_path)
+      workflow_name = self.workflow_name
+      if folder != self.workflow_name:
+        workflow_name = file_name.split(self.pid_file_extension)[0]
+
+      Logger.instance(LOG_ID).error(f"Workflow {workflow_name} is already running with PID {pid}")
+
+      if folder != workflow_name:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow down {workflow_name} --namespace {folder}` to stop it first.")
+      else:
+        Logger.instance(LOG_ID).error(f"Run `stoobly-agent scaffold workflow down {workflow_name}` to stop it first.")
+
+      sys.exit(1)
+
+  def __handle_up_stale(self, folder: str, pid: str, pid_file_path: str):
+    # PID file exists but process is not running, clean it up
+    os.remove(pid_file_path)
+
+  def __iterate_active_workflows(self, **kwargs):
+    handle_active: FunctionType = kwargs.get('handle_active')
+    handle_stale: FunctionType = kwargs.get('handle_stale')
+    tmp_dir_path = self.app.data_dir.tmp_dir_path
+
+    # For each folder in self.app.data_dir.tmp_dir_path
+    for folder in os.listdir(tmp_dir_path):
+      folder_path = os.path.join(tmp_dir_path, folder)
+
+      # If the folder is not a directory, skip
+      if not os.path.isdir(folder_path):
+        continue
+
+      # For each file in folder_path that ends with .pid
+      for file in os.listdir(folder_path):
+        if not file.endswith(self.pid_file_extension):
+          continue
+          
+        # If the folder contains a .pid file, then another workflow is running
+        pid_file_path = os.path.join(folder_path, file)
+        pid = self._read_pid(pid_file_path)
+        if pid and self._is_process_running(pid):
+          if handle_active:
+            handle_active(folder, pid, pid_file_path)
+        else:
+          if handle_stale:
+            handle_stale(folder, pid, pid_file_path)
+
+  def __remove_pid_file(self):
+    if os.path.exists(self.pid_file_path):
+      os.remove(self.pid_file_path)
+
   def __up_command(self, public_directory_paths: List[str], response_fixtures_paths: List[str], **options: WorkflowUpOptions):
     # Build the stoobly-agent run command
     command = ['stoobly-agent', 'run']
@@ -307,7 +365,7 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
       for line in script_lines:
         print(line, file=self.script)
 
-    if self.dry_run:
+    if self.dry_run or self.containerized:
       print(command_str)
     else:
       # Execute directly
@@ -320,20 +378,31 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
           check=True
         )
 
+        time.sleep(1) # Wait for the process to start
+
         if result.returncode != 0:
-          Logger.instance(LOG_ID).error(f"Failed to start agent, run `stoobly-agent workflow logs {self.workflow_name}` to see the error")
-          sys.exit(1)
+          self.__handle_up_error()
         
         # The --detached option prints the PID to stdout
         pid = int(result.stdout.strip())
+
+        if not self._is_process_running(pid):
+          self.__handle_up_error()
         
         # Write PID to file
-        self._write_pid(pid)
+        self.__create_pid_file(pid)
         
         Logger.instance(LOG_ID).info(f"Started {self.workflow_name} with PID: {pid}")
       except subprocess.CalledProcessError as e:
-        Logger.instance(LOG_ID).error(f"Failed to start {self.workflow_name}: {e}")
-        return None
+        self.__handle_up_error()
       except ValueError as e:
         Logger.instance(LOG_ID).error(f"Failed to parse PID from output: {e}")
-        return None
+        return None
+
+  def __handle_up_error(self):
+    log_file = f"{self.log_file_path}"
+    # Read log file it exists and print to stderr
+    if os.path.exists(log_file):
+      with open(log_file, 'r') as f:
+        print(f.read(), file=sys.stderr)
+    sys.exit(1)

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -201,7 +201,12 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     # Test workflow won't expose services that are detached and have a hostname to the host such as assets.
     # Need to test connection from inside the Docker network
     if self.service_config.hostname and self.workflow_name == WORKFLOW_TEST_TYPE:
-      self.validate_internal_hostname(url)
+      try:
+        self.validate_internal_hostname(url)
+      except ScaffoldValidateException:
+        time.sleep(1)
+        # Retry once
+        self.validate_internal_hostname(url)
 
     self.validate_init_containers(self.service_docker_compose.init_container_name, self.service_docker_compose.configure_container_name)
 

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

@@ -2,9 +2,11 @@
 #
 # STOOBLY_APP_DIR: path to the application source code directory, defaults to $(pwd)
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored, defaults to $(pwd)/.stoobly/ca_certs
+# STOOBLY_CA_CERTS_INSTALL_CONFIRM: confirm answer to CA certificate installation prompt
 # STOOBLY_CERTS_DIR: path to a folder to store certs, defaults to $(pwd)/.stoobly/certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder, defaults to $(pwd)
 # STOOBLY_DOTENV_FILE: path to dotenv file, defaults to $(pwd)/.env
+# STOOBLY_HOSTNAME_INSTALL_CONFIRM: confirm answer to hostname installation prompt
 # STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass 'stoobly-agent scaffold workflow' commands
 
 # Overridable Options
@@ -68,16 +70,17 @@ stoobly_exec_env=$(exec_env) CONTEXT_DIR="$(context_dir)"
 stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
 stoobly_exec_run_env=$(exec_env) CONTEXT_DIR="$(app_dir)"
 
-# Workflow run
-workflow_run=bash "$(app_dir)/$(workflow_script)"
-
 action/install:
 	$(eval action=install)
 action/uninstall:
 	$(eval action=uninstall)
 ca-cert/install: stoobly/install
 	@if [ -z "$$(ls $(ca_certs_dir) 2> /dev/null)" ]; then \
-		read -p "Installing CA certificate is required for $(workflow)ing requests, continue? (y/N) " confirm && \
+		if [ -n "$$STOOBLY_CA_CERTS_INSTALL_CONFIRM" ]; then \
+			confirm="$$STOOBLY_CA_CERTS_INSTALL_CONFIRM"; \
+		else \
+			read -p "Installing CA certificate is required for $(workflow)ing requests, continue? (y/N) " confirm; \
+		fi && \
 		if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 			echo "Running stoobly-agent ca-cert install..."; \
 			stoobly-agent ca-cert install --ca-certs-dir-path $(ca_certs_dir); \
@@ -107,10 +110,10 @@ intercept/disable:
 intercept/enable:
 	@export EXEC_COMMAND=intercept/.enable EXEC_OPTIONS="" EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
+mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
 mock/services: workflow/mock workflow/services
-mock/logs: workflow/mock workflow/logs
-mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+mock/logs: workflow/mock workflow/logs workflow/run
+mock/down: workflow/mock workflow/down workflow/run workflow/hostname/uninstall
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -121,10 +124,10 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
-record/down: workflow/record workflow/down workflow/hostname/uninstall
+record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
+record/down: workflow/record workflow/down workflow/run workflow/hostname/uninstall
 record/services: workflow/record workflow/services
-record/logs: workflow/record workflow/logs
+record/logs: workflow/record workflow/logs workflow/run
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=scenario/.create EXEC_OPTIONS="$(options)" EXEC_ARGS="$(name)" && \
@@ -154,18 +157,21 @@ stoobly/install: python/validate pipx/install
 		echo "stoobly-agent not found. Installing..."; \
 		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
-test: workflow/test workflow/up
+test: workflow/test workflow/up workflow/run
 test/services: workflow/test workflow/services
-test/logs: workflow/test workflow/logs
-test/down: workflow/test workflow/down
+test/logs: workflow/test workflow/logs workflow/run
+test/down: workflow/test workflow/down workflow/run
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down: dotenv
 	@export EXEC_COMMAND=scaffold/.down EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)
 workflow/hostname: stoobly/install
-	@read -p "Do you want to $(action) hostname(s) in /etc/hosts? (y/N) " confirm && \
+	@if [ -n "$$STOOBLY_HOSTNAME_INSTALL_CONFIRM" ]; then \
+		confirm="$$STOOBLY_HOSTNAME_INSTALL_CONFIRM"; \
+	else \
+		read -p "Do you want to $(action) hostname(s) in /etc/hosts? (y/N) " confirm; \
+	fi && \
 	if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 		CURRENT_VERSION=$$(stoobly-agent --version); \
 		REQUIRED_VERSION="1.4.0"; \
@@ -180,14 +186,15 @@ workflow/hostname/install: action/install workflow/hostname
 workflow/hostname/uninstall: action/uninstall workflow/hostname  
 workflow/logs:
 	@export EXEC_COMMAND=scaffold/.logs EXEC_OPTIONS="$(workflow_log_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)
 workflow/mock:
 	$(eval workflow=mock)
 workflow/namespace: tmpdir
 	@mkdir -p $(workflow_namespace_dir)
 workflow/record:
 	$(eval workflow=record)
+workflow/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/services:
 	@export EXEC_COMMAND=scaffold/.services EXEC_OPTIONS="$(workflow_service_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
@@ -195,5 +202,4 @@ workflow/test:
 	$(eval workflow=test) $(eval workflow_up_extra_options=$(workflow_up_extra_options) --no-publish)
 workflow/up: dotenv
 	@export EXEC_COMMAND=scaffold/.up EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(stoobly_exec_run)

stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.down

@@ -7,6 +7,5 @@ mkdir -p .stoobly/tmp
 stoobly-agent scaffold workflow down \
   --app-dir-path "$(pwd)" \
   --containerized \
-  --dry-run \
   --log-level error \
   $extra_options $1 > /dev/null

stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.logs

@@ -4,6 +4,6 @@ extra_options=$EXEC_OPTIONS
 
 stoobly-agent scaffold workflow logs \
   --app-dir-path "$(pwd)" \
-  --dry-run \
+  --containerized \
   --log-level warning \
   $extra_options $1 > /dev/null

stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.up

@@ -5,7 +5,6 @@ extra_options=$EXEC_OPTIONS
 stoobly-agent scaffold workflow up \
   --app-dir-path "$(pwd)" \
   --containerized \
-  --dry-run \
   --log-level warning \
   --mkcert \
   $extra_options $1 > /dev/null

stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.run

@@ -3,6 +3,8 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
+npx cypress run --project .
+
 if [ -f .env ]; then
   set -a; . ./.env; set +a;
 fi
@@ -12,8 +14,6 @@ export http_proxy=http://localhost:$APP_PROXY_PORT
 export HTTPS_PROXY=http://localhost:$APP_PROXY_PORT
 export https_proxy=http://localhost:$APP_PROXY_PORT
 
-npx cypress run --project .
-
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.run

@@ -3,6 +3,8 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
+npx playwright test --reporter dot
+
 if [ -f .env ]; then
   set -a; . ./.env; set +a;
 fi
@@ -12,8 +14,6 @@ export http_proxy=http://localhost:$APP_PROXY_PORT
 export HTTPS_PROXY=http://localhost:$APP_PROXY_PORT
 export https_proxy=http://localhost:$APP_PROXY_PORT
 
-npx playwright test --reporter dot
-
 entrypoint=$1
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -28,6 +28,7 @@ class WorkflowRunCommand(WorkflowCommand):
     self.__current_working_dir = os.getcwd()
     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.__containerized = kwargs.get('containerized') or False
     self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
     self.__dry_run = kwargs.get('dry_run', False)
     self.__namespace = kwargs.get('namespace') or self.workflow_name
@@ -48,6 +49,10 @@ class WorkflowRunCommand(WorkflowCommand):
   def certs_dir_path(self):
     return self.__certs_dir_path
 
+  @property
+  def containerized(self):
+    return self.__containerized
+
   @property
   def context_dir_path(self):
     if not self.__context_dir_path:

stoobly_agent/app/cli/scaffold_cli.py

@@ -341,6 +341,7 @@ def copy(**kwargs):
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--containerized', is_flag=True, help='Set if run from within a container.')
 @click.option('--dry-run', default=False, is_flag=True)
+@click.option('--hostname-uninstall-confirm', default=None, type=click.Choice(['y', 'Y', 'n', 'N']), help='Confirm answer to hostname uninstall prompt.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
@@ -385,7 +386,20 @@ def down(**kwargs):
       script=script,
       **kwargs
     )
-  
+
+    # Because test workflow is completely containerized, we don't need to prompt to install hostnames in /etc/hosts
+    # Entrypoint container will be within the container network
+    if workflow_command.workflow_template != WORKFLOW_TEST_TYPE:
+      if not containerized and not kwargs['dry_run']:
+        # Prompt confirm to install hostnames
+        if kwargs.get('hostname_uninstall_confirm'):
+          confirm = kwargs['hostname_uninstall_confirm']
+        else:
+          confirm = input(f"Do you want to uninstall hostnames for {kwargs['workflow_name']}? (y/N) ")
+
+        if confirm == "y" or confirm == "Y":
+          __hostname_uninstall(app_dir_path=kwargs['app_dir_path'], service=kwargs['service'], workflow=[kwargs['workflow_name']])
+
   # Execute the workflow down
   workflow_command.down(
     **command_args,
@@ -401,6 +415,7 @@ def down(**kwargs):
 @click.option(
   '--container', multiple=True, help=f"Select which containers to log. Defaults to '{WORKFLOW_CONTAINER_PROXY}'"
 )
+@click.option('--containerized', is_flag=True, help='Set if run from within a container.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--follow', is_flag=True, help='Follow last container log output.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
@@ -457,11 +472,13 @@ def logs(**kwargs):
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--ca-certs-dir-path', default=data_dir.ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
+@click.option('--ca-certs-install-confirm', default=None, type=click.Choice(['y', 'Y', 'n', 'N']), help='Confirm answer to CA certificate installation prompt.')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--containerized', is_flag=True, help='Set if run from within a container.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--detached', is_flag=True, help='If set, will run the highest priority service in the background.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
+@click.option('--hostname-install-confirm', default=None, type=click.Choice(['y', 'Y', 'n', 'N']), help='Confirm answer to hostname installation prompt.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
@@ -472,7 +489,6 @@ def logs(**kwargs):
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 @click.option('--user-id', default=os.getuid(), help='OS user ID of the owner of context dir path.')
 @click.option('--verbose', is_flag=True)
-@click.option('-y', '--yes', is_flag=True, help='Auto-confirm CA certificate installation prompt.')
 @click.argument('workflow_name')
 def up(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
@@ -491,17 +507,15 @@ def up(**kwargs):
   # First time if folder does not exist or is empty
   first_time = not os.path.exists(app.ca_certs_dir_path) or not os.listdir(app.ca_certs_dir_path)
   if first_time and not containerized and not dry_run:
-    # If ca certs dir path does not exist, run ca-cert install
-    if kwargs.get('yes'):
-      # Auto-confirm if -y/--yes option is provided
-      ca_cert_install(app.ca_certs_dir_path)
+    if kwargs.get('ca_certs_install_confirm'):
+      confirm = kwargs['ca_certs_install_confirm']
     else:
       confirm = input(f"Installing CA certificate is required for {kwargs['workflow_name']}ing requests, continue? (y/N) ")
-      if confirm == "y" or confirm == "Y":
-        ca_cert_install(app.ca_certs_dir_path)
-      else:
-        print("You can install the CA certificate later by running: stoobly-agent ca-cert install")
-        sys.exit(1)
+
+    if confirm == "y" or confirm == "Y":
+      ca_cert_install(app.ca_certs_dir_path)
+    else:
+      print("You can install the CA certificate later by running: stoobly-agent ca-cert install")
 
   services = __get_services(
     app, service=kwargs['service'], workflow=[kwargs['workflow_name']]
@@ -533,6 +547,19 @@ def up(**kwargs):
       **kwargs
     )
 
+    # Because test workflow is complete containerized, we don't need to prompt to install hostnames in /etc/hosts
+    # Entrypoint container will be within the container network
+    if workflow_command.workflow_template != WORKFLOW_TEST_TYPE:
+      if not containerized and not dry_run:
+        # Prompt confirm to install hostnames
+        if kwargs.get('hostname_install_confirm'):
+          confirm = kwargs['hostname_install_confirm']
+        else:
+          confirm = input(f"Do you want to install hostnames for {kwargs['workflow_name']}? (y/N) ")
+
+        if confirm == "y" or confirm == "Y":
+          __hostname_install(app_dir_path=kwargs['app_dir_path'], service=kwargs['service'], workflow=[kwargs['workflow_name']])
+
   if first_time and not containerized and not dry_run:
     options = {}
 
@@ -596,30 +623,7 @@ def validate(**kwargs):
 @click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def install(**kwargs):
-  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
-  __validate_app(app)
-
-  services = __get_services(
-    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
-  )
-
-  hostnames = []
-  for service_name in services:
-    service = Service(service_name, app)
-    __validate_service_dir(service.dir_path)
-
-    service_config = ServiceConfig(service.dir_path)
-    if service_config.hostname:
-      hostnames.append(service_config.hostname)
-
-  __elevate_sudo()
-
-  try:
-    hosts_file_manager = HostsFileManager()
-    hosts_file_manager.install_hostnames(hostnames)
-  except PermissionError:
-    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
-    sys.exit(1)
+  __hostname_install(**kwargs)
 
 @hostname.command(
   help="Delete from the system hosts file all scaffold service hostnames"
@@ -628,30 +632,7 @@ def install(**kwargs):
 @click.option('--service', multiple=True, help='Select specific services. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def uninstall(**kwargs):
-  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
-  __validate_app(app)
-
-  services = __get_services(
-    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
-  )
-
-  hostnames = []
-  for service_name in services:
-    service = Service(service_name, app)
-    __validate_service_dir(service.dir_path)
-
-    service_config = ServiceConfig(service.dir_path)
-    if service_config.hostname:
-      hostnames.append(service_config.hostname)
-
-  __elevate_sudo()
-
-  try:
-    hosts_file_manager = HostsFileManager()
-    hosts_file_manager.uninstall_hostnames(hostnames)
-  except PermissionError:
-    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
-    sys.exit(1)
+  __hostname_uninstall(**kwargs)
 
 scaffold.add_command(app)
 scaffold.add_command(service)
@@ -716,6 +697,64 @@ def __get_services(app: App, **kwargs):
 
   return services
 
+def __hostname_install(**kwargs):
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
+  __validate_app(app)
+
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
+
+  hostnames = []
+  for service_name in services:
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
+    service_config = ServiceConfig(service.dir_path)
+    if service_config.hostname:
+      hostnames.append(service_config.hostname)
+
+  if not hostnames:
+    return
+
+  __elevate_sudo()
+
+  try:
+    hosts_file_manager = HostsFileManager()
+    hosts_file_manager.install_hostnames(hostnames)
+  except PermissionError:
+    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+    sys.exit(1)
+
+def __hostname_uninstall(**kwargs):
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
+  __validate_app(app)
+
+  services = __get_services(
+    app, service=kwargs['service'], without_core=True, workflow=kwargs['workflow']
+  )
+
+  hostnames = []
+  for service_name in services:
+    service = Service(service_name, app)
+    __validate_service_dir(service.dir_path)
+
+    service_config = ServiceConfig(service.dir_path)
+    if service_config.hostname:
+      hostnames.append(service_config.hostname)
+
+  if not hostnames:
+    return
+
+  __elevate_sudo()
+
+  try:
+    hosts_file_manager = HostsFileManager()
+    hosts_file_manager.uninstall_hostnames(hostnames)
+  except PermissionError:
+    print("Permission denied. Please run this command with sudo.", file=sys.stderr)
+    sys.exit(1)
+
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")
 

stoobly_agent/test/app/cli/scaffold/docker/cli_invoker.py

@@ -117,7 +117,7 @@ class ScaffoldCliInvoker():
     command = ['workflow', 'up',
       '--app-dir-path', app_dir_path,
       '--context-dir-path', app_dir_path,
-      '--yes',
+      '--hostname-install-confirm', 'n',
       target_workflow_name,
     ]
     result = runner.invoke(scaffold, command)
@@ -134,6 +134,7 @@ class ScaffoldCliInvoker():
     command = ['workflow', 'down',
       '--app-dir-path', app_dir_path,
       '--context-dir-path', app_dir_path,
+      '--hostname-uninstall-confirm', 'n',
       target_workflow_name,
     ]
     result = runner.invoke(scaffold, command)

stoobly_agent/test/app/cli/scaffold/local/cli_invoker.py

@@ -92,8 +92,9 @@ class LocalScaffoldCliInvoker():
   def cli_workflow_up(runner: CliRunner, app_dir_path: str, target_workflow_name: str):
     command = ['workflow', 'up',
       '--app-dir-path', app_dir_path,
+      '--ca-certs-install-confirm', 'y',
       '--context-dir-path', app_dir_path,
-      '--yes',
+      '--hostname-install-confirm', 'y',
       target_workflow_name,
     ]
     result = runner.invoke(scaffold, command)

{stoobly_agent-1.10.3.dist-info → stoobly_agent-1.10.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stoobly-agent
-Version: 1.10.3
+Version: 1.10.5
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 License-File: LICENSE

{stoobly_agent-1.10.3.dist-info → stoobly_agent-1.10.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=G6RHX8ESNEXsGSpOUuCoZooxoXtbFgnLwqa8NHC683M,45
+stoobly_agent/__init__.py,sha256=sxrNGBqNJn6xpatZ-k8nV1eIVOpFpk1_oBfoMJlWMWA,45
 stoobly_agent/__main__.py,sha256=tefOkFZeCFU4l3C-Y4R_lR9Yt-FETISiXGUnbh6Os54,146
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=NIgcbX7iiWrApsCITXlmhr4SYbWS0fwb01x-F3jTFdo,666
@@ -70,7 +70,7 @@ stoobly_agent/app/cli/scaffold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 stoobly_agent/app/cli/scaffold/app.py,sha256=7d5nHnQwyBxEwSC2Jrvbk2U3dj9OnhaHrE2zmC37oOs,3922
 stoobly_agent/app/cli/scaffold/app_command.py,sha256=x--ejtVSBL0Jz8OiakBtxfI2IZFAWJWCwuSJo7TEU9Y,2386
 stoobly_agent/app/cli/scaffold/app_config.py,sha256=oG06y9yuAo05ROpOhDC_LFPJ0KKNrhfvYLOgHx5nE4Y,2788
-stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=G4C-XSp4hN0FvaSKLpGGvTp8iXHqKYdqoxxRPHgO0a0,8253
+stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=6wGEuBkIkQkpyFv41C8CVkT2y1RCzD5OCEI9fZXku0s,8311
 stoobly_agent/app/cli/scaffold/command.py,sha256=G4Zp647cuviaEXUdcl7Rbx_qQAr0Z_DS7-Y3MWDC1Qc,281
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
 stoobly_agent/app/cli/scaffold/constants.py,sha256=aI--kf5t9D10iBZKujMXVB5IjYML1mX8bhchT9d560k,3324
@@ -95,7 +95,7 @@ stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=DGaSlbOvA
 stoobly_agent/app/cli/scaffold/docker/workflow/local_decorator.py,sha256=xp1TmP8drOyl9Zhm5B1ci6NqPqRFDr2yxipmvSljgiE,717
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=QO1TbAj6QthIyHvy7itV_d9NteNcjClYaan1GX-0kLc,1201
 stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=tSPnscsBZusBaSt_NlB4exrZ2MnWMRAUJgw_NaEdHiw,1199
-stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=az_asRqxfch_M6gRdtoZI6_QgYbOSEKutrf8q_asp-8,15753
+stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=aqRVHTbCooan8zTMfKjxEjssf255YTEdLzoPUXna29o,18010
 stoobly_agent/app/cli/scaffold/env.py,sha256=dT33tHoQaUxfsFCYm8kfaAv-qPVrUPmNFQmLnFQhZeQ,1107
 stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD7_CPqDz02b_ghXsY3oTjjB4,4999
 stoobly_agent/app/cli/scaffold/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +103,7 @@ stoobly_agent/app/cli/scaffold/local/service/__init__.py,sha256=47DEQpj8HBSa-_TI
 stoobly_agent/app/cli/scaffold/local/service/builder.py,sha256=uZNPIQWo4UcLy3bcE6Wvntle6ONPpWjS5oAq3g0Punk,1852
 stoobly_agent/app/cli/scaffold/local/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/local/workflow/builder.py,sha256=O8Iwyd231-ciQWkiGB5HAiFJXMDUtXIoyl0S_Jrj3lQ,806
-stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=gBVLi7I42B9_HCpzBoM3XtxzmvjDc_3FnquxH8YqsfA,13030
+stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=BJrG5g-c4kf_cgQ1hE41KUKQsvtwVVKzaTgQ7eCaPUk,15625
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=74JwjTRRkk6lo-k9hre1iGztbKa9zDqjPVx3Qgpze-s,699
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=j-lkG5Zth_CBHa6Z9Kv3dJwxX9gylFBZMZbW691R8ZU,1480
@@ -114,10 +114,10 @@ stoobly_agent/app/cli/scaffold/service_dependency.py,sha256=olr_s_cfn51Pz5FlIihl
 stoobly_agent/app/cli/scaffold/service_docker_compose.py,sha256=fVUZ-oo-bn5GVZp8JgGq7AkiQQ6-JkxwK_OMlinS9WM,915
 stoobly_agent/app/cli/scaffold/service_update_command.py,sha256=oWusBKfvjt4RnK03_V3CJYWrfsCI4_LcR7W12eLXMR4,2579
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
-stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=80pX8vTKWCP3Or7zW7lZpn2LS8ScnwMZsjItKizHIkQ,11627
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=DPYLBAwUsh4C8ho-4SwjBe32xuBSUpWlWgRF9JIbKRc,11768
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=x8C_a0VoO_vUbosp4_6IC1U7Ge9NnUdVKDPpVMtMkeY,171
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=9DQK-OXnRKjjKWsUSIRAio6dkR4eGxD1vizPT7Q5sp8,159
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=OnY_3D9nxl3HxfUxvCgk7PY3XntEbgO9j1myx_ETK7w,9161
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=9E46Dzs3xCKy2fP6L6Q4DxourYxrwKCcoUhEf3Y7DEs,9619
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=SABod6_InBFyOm-uulK7r27SR0sWRUiL0h69g_jvNJA,249
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
@@ -182,11 +182,11 @@ stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init,sh
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.run,sha256=LQs_bJiN3LaC0eJnaF_Fnrr9ZIlxkaM8tnWMxjCovXM,446
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/intercept/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/intercept/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
-stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.down,sha256=WtEjm2hJ01-1GGxRmmcUqZq7VjEe5JfZZKvm8TNhNEs,219
-stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.logs,sha256=4CJVEVLn9VTQN9LAjOJpijwd_DZ5IuIXL1aFCYkelxk,178
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.down,sha256=Eb-DY3NYLBny2Akx4R3ckqHqi_5gzYKNp9tJgFbeFOQ,205
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.logs,sha256=ebsSW7N3RbT4asqDVpdKWzztC3FZxXLpjnxsiblMSGQ,184
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.services,sha256=sAbaKzBxNDXimyUNinB_a2Kt47vUCa0Kd3Z1QAp2GrU,161
-stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.up,sha256=_0ZrBktSJRJm4Tubin8nYmjebui5Wv6r3tPQ_FN8nxo,209
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.up,sha256=woSsPc0S9CasNItleUD1nz6Rz-8TThamy-3_DGLMiSk,195
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scenario/.create,sha256=EZe84bLAKB-mrB9PGMx-amyMjp6x-ESUZKC8wxrWdLE,245
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scenario/.delete,sha256=RspRDQ7WT5jpN2o-6qXOlH-A2VpN4981pD4ZJljk9Rw,260
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scenario/.list,sha256=BdX3ARC-Piuwk0vFzBrcxEwtHjdFncpORzqP-hP4IwE,84
@@ -206,11 +206,11 @@ stoobly_agent/app/cli/scaffold/templates/constants.py,sha256=o6SbbG0AJoIYI0cQ5qD
 stoobly_agent/app/cli/scaffold/templates/factory.py,sha256=WuAKRGq4qMGQTxgG8Hx0Q8xzMoe87IRPfxrwcCeCP2E,2537
 stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.Dockerfile.cypress,sha256=iMEONOnfsVTKpoVxv-tHDfUTCiemEMCt0LZ9QcdOyJQ,680
 stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.docker-compose.yml,sha256=fPjbDnGQQj-TLGQbctHBwgXnC8zz2m9H-9uYK0I8mwk,484
-stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.run,sha256=YzvRZqTqIy4P5sM7SBsUjVgI6un6KbjwkbuPgF5FWB8,475
+stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.run,sha256=nwTqzhR5a7OgfQj7aPiq0_3_smV0qTLw1WRcPFNQEtM,475
 stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.Dockerfile.playwright,sha256=LGibNX2Ar2r_yDbb4AcdCm6zzArtOHDk_cvRxszKExw,1221
 stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.docker-compose.yml,sha256=1eyJ-wYLXXhiPaT9dYhORaa9IGnhSaqnMuLSwxrAPiQ,503
 stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.entrypoint.sh,sha256=vIffcTuYdoOLH3GDKzoppExDhP0ls92wyPziqpxZrAc,286
-stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.run,sha256=a7UxsdfxNssbu5jLnNiHZKMmY5KD0fixk8L6dnKHLCE,482
+stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.run,sha256=6AS9JZtoFw5eA4Gmh6wRbJq8BDujNLoifyLbRK1BkrI,482
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/configure,sha256=ktsd7J4r3YQbeUj7Uex7iakdcb6JAouwvlRqs-LI35c,171
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/docker-compose.yml,sha256=x6tofP1N9rFnlMdWKtyjzpWnX7-_h6eYihI_iDxGr90,479
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
@@ -240,9 +240,9 @@ stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5gSkxNxrXLeobLU
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=shPjoX1SWe7K6pGpZvw2fPVHWd6j_azTe58jvOjGUns,607
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_namesapce.py,sha256=VNaZrcqMMeqrzpPGhD9-oaZems1k0ebRc6wR74EvA8c,1170
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=842VEl4hxpgxJdqZQErY7gb2hhcykErApOw9rfexSdY,6049
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=35wxoc9qH3ZGuPcKgFGQLEMvGwDVWbjpXqve4iz2wBY,6185
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
-stoobly_agent/app/cli/scaffold_cli.py,sha256=us5QCcuseawNJh2Y3gvOHUa9h2GFqlX_c-grar5Ntuo,31653
+stoobly_agent/app/cli/scaffold_cli.py,sha256=YnRKrC_XQ5OdQ1tgA-oL4rmamw70DlMm17SqIAQ9sfU,33677
 stoobly_agent/app/cli/scenario_cli.py,sha256=lA9a4UNnLzrbJX5JJE07KGb5i9pBd2c2vdFUW6_7k0E,8345
 stoobly_agent/app/cli/snapshot_cli.py,sha256=1Dw5JgDlmG6vctrawIRO7CdB73vAQk_wRBnPG2lVOrQ,11929
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -721,12 +721,12 @@ stoobly_agent/test/app/cli/request/request_reset_test.py,sha256=5My6Z452eideAOUu
 stoobly_agent/test/app/cli/request/request_response_test.py,sha256=Fu-A8tIn016DKme4WIaPzo3YeFY-CPtTOpaSFigUVVM,1263
 stoobly_agent/test/app/cli/request/request_snapshot_test.py,sha256=3kMmv0CuvnMXLgDQA-_u9S1DIiNOdL63L-IptVuOpf8,6308
 stoobly_agent/test/app/cli/request/request_test_test.py,sha256=-cJNXKjgryVVfVt-7IN5fIhBwe3NjFoPmeavDH8lAjU,5527
-stoobly_agent/test/app/cli/scaffold/docker/cli_invoker.py,sha256=jVTiFytPJhmrz8nTDb9xZYbRCFugOb4s7FglE_kiR3c,5322
+stoobly_agent/test/app/cli/scaffold/docker/cli_invoker.py,sha256=W4ZZgrgUU0hBm_l0x04eR_9eGVyfbLSMbDVGqhpi2qE,5391
 stoobly_agent/test/app/cli/scaffold/docker/cli_test.py,sha256=wkYnRQo8OBDds-pGmdc2cYs5yxgO_2GiDxzI1imGntc,4301
 stoobly_agent/test/app/cli/scaffold/docker/e2e_test.py,sha256=RxHvIMyVhpXy0fkfCJPFLZ2DtyC3dieVGETWOq-rQos,13655
 stoobly_agent/test/app/cli/scaffold/hosts_file_manager_test.py,sha256=ztcPh1x0ZCW1FWA5YL4ulEVjfbW9TOPgk1bnSDPNmCw,2287
 stoobly_agent/test/app/cli/scaffold/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/test/app/cli/scaffold/local/cli_invoker.py,sha256=BL5OVbibeDr3xsiUZQNvAmZmTdmmGh0hQVRl6AEFhXI,4071
+stoobly_agent/test/app/cli/scaffold/local/cli_invoker.py,sha256=YLQuz5JjvzfqFKk-BFT-Bl9EZgj37ZDZtwNsvqNRDHA,4138
 stoobly_agent/test/app/cli/scaffold/local/e2e_test.py,sha256=10cFuX43dv6-L00zWHT9MV5c0idJhiLDhEw0FOOsKK8,15513
 stoobly_agent/test/app/cli/scenario/scenario_create_test.py,sha256=fGqcjO1_1OvdpUMQfGRVkSyFe61u8WIcp_ndLFrf33A,3962
 stoobly_agent/test/app/cli/scenario/scenario_replay_integration_test.py,sha256=NbGJzmvPsNLBR0ac65yt_cOTfpnsST1IG7i3F0euwAk,7031
@@ -797,8 +797,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=6v4AHeqYPw7vtRoxET_ubmRWPJoSmTR_DVHay3FxNbQ,1299
-stoobly_agent-1.10.3.dist-info/METADATA,sha256=WOtXuRZ-PH8eZ38X2Z63_zddgLbLMbtLJ6Mbq3-vo6I,3203
-stoobly_agent-1.10.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-stoobly_agent-1.10.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.10.3.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.10.3.dist-info/RECORD,,
+stoobly_agent-1.10.5.dist-info/METADATA,sha256=7QB_Saw0H6Pz_qkMRM9HKiXta5p-noQJIMFN5lGVm4g,3203
+stoobly_agent-1.10.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+stoobly_agent-1.10.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.10.5.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.10.5.dist-info/RECORD,,