stoobly-agent 1.9.12__py3-none-any.whl → 1.10.1__py3-none-any.whl

stoobly_agent/app/cli/scaffold_cli.py

@@ -12,8 +12,9 @@ from stoobly_agent.app.cli.helpers.shell import exec_stream
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
 from stoobly_agent.app.cli.scaffold.constants import (
-  DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
+  SERVICES_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
+from stoobly_agent.app.cli.scaffold.constants import PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT
 from stoobly_agent.app.cli.scaffold.containerized_app import ContainerizedApp
 from stoobly_agent.app.cli.scaffold.docker.service.configure_gateway import configure_gateway
 from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
@@ -90,18 +91,25 @@ def hostname(ctx):
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
 @click.option('--docker-socket-path', default='/var/run/docker.sock', type=click.Path(exists=True, file_okay=True, dir_okay=False), help='Path to Docker socket.')
+@click.option('--plugin', multiple=True, type=click.Choice([PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT]), help='Scaffold integrations.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name', callback=validate_app_name)
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
 
-  if not kwargs['quiet'] and os.path.exists(app.scaffold_namespace_path):
-    print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
+  if not kwargs['quiet']:
+    if os.path.exists(app.scaffold_namespace_path):
+      print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
+    else:
+      print(f"Creating scaffold in {kwargs['app_dir_path']}")
+
+  res = AppCreateCommand(app, **kwargs).build()
 
-  AppCreateCommand(app, **kwargs).build()
+  for warning in res['warnings']:
+    print(f"{bcolors.WARNING}WARNING{bcolors.ENDC}: {warning}")
 
 @app.command(
   help="Scaffold app service certs"
@@ -113,7 +121,7 @@ def create(**kwargs):
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
 @click.option('--workflow', multiple=True, help='Specify services by workflow(s). Defaults to all.')
 def mkcert(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   services = __get_services(
@@ -129,25 +137,20 @@ def mkcert(**kwargs):
 @click.option('--detached', is_flag=True, help='Use isolated and non-persistent context directory.')
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--hostname', callback=validate_hostname, help='Service hostname.')
+@click.option('--local', is_flag=True, help='Specifies upstream service is local. Overrides `--upstream-hostname` option.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
-@click.option('--proxy-mode', help='''
-  Proxy mode can be "regular", "transparent", "socks5",
-  "reverse:SPEC", or "upstream:SPEC". For reverse and
-  upstream proxy modes, SPEC is host specification in
-  the form of "http[s]://host[:port]".
-''')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
+@click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
+@click.option('--upstream-port', type=click.IntRange(1, 65535), help='Upstream service port.')
+@click.option('--upstream-scheme', type=click.Choice(['http', 'https']), help='Upstream service scheme.')
 @click.option('--workflow', multiple=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Include pre-defined workflows.')
 @click.argument('service_name', callback=validate_service_name)
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  if kwargs.get("proxy_mode"):
-    __validate_proxy_mode(kwargs.get("proxy_mode"))
-
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   service = Service(kwargs['service_name'], app)
 
   if not kwargs['quiet'] and os.path.exists(service.dir_path):
@@ -164,15 +167,17 @@ def create(**kwargs):
 @click.option('--select', multiple=True, help='Select column(s) to display.')
 @click.option('--service', multiple=True, help='Select specific services.')
 @click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
+@click.option('--all', is_flag=True, default=False, help='Display all services including core and user defined services')
 @click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by. Defaults to all.')
 def _list(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
-  services = __get_services(app, service=kwargs['service'], workflow=kwargs['workflow'])
+  without_core = not kwargs['all']
+  services = __get_services(app, service=kwargs['service'],  without_core=without_core, workflow=kwargs['workflow'])
 
   rows = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -184,13 +189,29 @@ def _list(**kwargs):
 
   print_services(rows, **select_print_options(kwargs))
 
+@service.command(
+  help="Show information about a service",
+)
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--format', type=click.Choice(FORMATS), help='Format output.')
+@click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
+@click.argument('service_name')
+@click.pass_context
+def show(ctx, **kwargs):
+  service_name = kwargs['service_name']
+  del kwargs['service_name']
+  kwargs['service'] = [service_name]
+
+  # Invoke list with 1 service
+  ctx.invoke(_list, **kwargs)
+
 @service.command(
   help="Delete a service",
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.argument('service_name')
 def delete(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   service = Service(kwargs['service_name'], app)
@@ -207,19 +228,17 @@ def delete(**kwargs):
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--hostname', callback=validate_hostname, help='Service hostname.')
+@click.option('--local', is_flag=True, help='Specifies upstream service is local. Overrides `--upstream-hostname` option.')
+@click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
-@click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
+@click.option('--priority', type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
-@click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
-@click.option('--proxy-mode', help='''
-  Proxy mode can be "regular", "transparent", "socks5",
-  "reverse:SPEC", or "upstream:SPEC". For reverse and
-  upstream proxy modes, SPEC is host specification in
-  the form of "http[s]://host[:port]".
-''')
+@click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
+@click.option('--upstream-port', type=click.IntRange(1, 65535), help='Upstream service port.')
+@click.option('--upstream-scheme', type=click.Choice(['http', 'https']), help='Upstream service scheme.')
 @click.argument('service_name')
 def update(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   service = Service(kwargs['service_name'], app)
@@ -228,29 +247,29 @@ def update(**kwargs):
 
   service_config = ServiceConfig(service.dir_path)
 
-  if kwargs['hostname']:
-    old_hostname = service_config.hostname
-
-    if old_hostname != kwargs['hostname']:
-      service_config.hostname = kwargs['hostname']
+  service_config.local = kwargs['local']
 
-      # If this is the default proxy_mode and the origin matches the original hostname, assume it is safe to update with the new hostname
-      if service_config.proxy_mode.startswith("reverse:"):
-        old_origin = service_config.proxy_mode.split("reverse:")[1]
-        parsed_origin_url = urlparse(old_origin)
+  if kwargs['hostname']:
+    service_config.hostname = kwargs['hostname']
 
-        if old_hostname == parsed_origin_url.hostname:
-          service_config.proxy_mode = service_config.proxy_mode.replace(old_hostname, service_config.hostname)
+  if kwargs['port']:
+    service_config.port = kwargs['port']
 
   if kwargs['priority']:
     service_config.priority = kwargs['priority']
 
-  if kwargs['port']:
-    service_config.port = kwargs['port']
-
   if kwargs['scheme']:
     service_config.scheme = kwargs['scheme']
 
+  if kwargs['upstream_hostname']:
+    service_config.upstream_hostname = kwargs['upstream_hostname']
+
+  if kwargs['upstream_port']:
+    service_config.upstream_port = kwargs['upstream_port']
+
+  if kwargs['upstream_scheme']:
+    service_config.upstream_scheme = kwargs['upstream_scheme']
+
   if kwargs['name']:
     old_service_name = service.service_name
     new_service_name = kwargs['name']
@@ -264,10 +283,6 @@ def update(**kwargs):
 
     print(f"Successfully renamed service to: {new_service_name}")
 
-  if kwargs['proxy_mode']:
-    __validate_proxy_mode(kwargs['proxy_mode'])
-    service_config.proxy_mode = kwargs['proxy_mode']
-
   service_config.write()
 
 @workflow.command(
@@ -282,7 +297,7 @@ def update(**kwargs):
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
@@ -308,13 +323,13 @@ def create(**kwargs):
 @click.argument('workflow_name')
 @click.argument('destination_workflow_name')
 def copy(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, **kwargs)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE, **kwargs)
 
   for service_name in kwargs['service']:
     config = { **kwargs }
     del config['service']
     config['service_name'] = service_name
-      
+
     command = WorkflowCopyCommand(app, **config)
 
     if not command.app_dir_exists:
@@ -345,7 +360,7 @@ def down(**kwargs):
   containerized = kwargs['containerized']
 
   app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
-  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
+  app = App(app_dir_path, SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -384,7 +399,7 @@ def down(**kwargs):
     )
     if not exec_command:
       continue
-    
+
     print(exec_command, file=script)
 
   # After services are stopped, their network needs to be removed
@@ -424,7 +439,7 @@ def down(**kwargs):
 def logs(**kwargs):
   os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -448,7 +463,7 @@ def logs(**kwargs):
         continue
 
     config = { **kwargs }
-    config['service_name'] = service 
+    config['service_name'] = service
     command = WorkflowLogCommand(app, **config)
     commands.append(command)
 
@@ -500,7 +515,7 @@ def up(**kwargs):
   # Because we are running a docker-compose command which depends on APP_DIR env var
   # when we are running this command within a container, the host's app_dir_path will likely differ
   app_dir_path = current_working_dir if containerized else kwargs['app_dir_path']
-  app = App(app_dir_path, DOCKER_NAMESPACE, **kwargs)
+  app = App(app_dir_path, SERVICES_NAMESPACE, **kwargs)
   __validate_app(app)
 
   __with_namespace_defaults(kwargs)
@@ -511,7 +526,7 @@ def up(**kwargs):
   )
 
   if kwargs['mkcert']:
-    _app = ContainerizedApp(app_dir_path, DOCKER_NAMESPACE) if containerized else app
+    _app = ContainerizedApp(app_dir_path, SERVICES_NAMESPACE) if containerized else app
     __services_mkcert(_app, services)
 
   # Gateway ports are dynamically set depending on the workflow run
@@ -581,11 +596,11 @@ def up(**kwargs):
 @click.option('--app-dir-path', default=current_working_dir, help='Path to validate the app scaffold.')
 @click.argument('workflow_name')
 def validate(**kwargs):
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   workflow = Workflow(kwargs['workflow_name'], app)
-  
+
   config = { **kwargs }
   config['service_name'] = 'build'
 
@@ -617,7 +632,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'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   services = __get_services(
@@ -625,7 +640,7 @@ def install(**kwargs):
   )
 
   hostnames = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -649,7 +664,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'], DOCKER_NAMESPACE)
+  app = App(kwargs['app_dir_path'], SERVICES_NAMESPACE)
   __validate_app(app)
 
   services = __get_services(
@@ -657,7 +672,7 @@ def uninstall(**kwargs):
   )
 
   hostnames = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -734,7 +749,7 @@ def __get_services(app: App, **kwargs):
 
   services = list(set(selected_services))
   services.sort()
-  
+
   return services
 
 def __print_header(text: str):
@@ -771,7 +786,7 @@ def __services_mkcert(app: App, services):
       continue
 
     hostname = service_config.hostname
-    
+
     if not hostname:
       continue
 
@@ -786,8 +801,11 @@ def __validate_app(app: App):
     sys.exit(1)
 
 def __validate_app_dir(app_dir_path):
-  if not os.path.exists(app_dir_path):
-    print(f"Error: {app_dir_path} does not exist", file=sys.stderr)
+  __validate_dir(app_dir_path)
+
+def __validate_dir(dir_path):
+  if not os.path.exists(dir_path):
+    print(f"Error: {dir_path} does not exist", file=sys.stderr)
     sys.exit(1)
 
 def __validate_service_dir(service_dir_path):
@@ -795,35 +813,6 @@ def __validate_service_dir(service_dir_path):
     print(f"Error: '{service_dir_path}' does not exist, please scaffold this service", file=sys.stderr)
     sys.exit(1)
 
-def __validate_proxy_mode(proxy_mode: str) -> None:
-  valid_exact_matches = {
-    "regular": None,
-    "transparent": None,
-    "socks5": None,
-  }
-
-  valid_prefixes = {
-    "reverse": None,
-    "upstream": None
-  }
-
-  if proxy_mode in valid_exact_matches:
-    return
-
-  split_str = proxy_mode.split(":", 1)
-  if len(split_str) != 2:
-    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
-    sys.exit(1)
-
-  prefix = split_str[0]
-  spec = split_str[1]
-
-  if prefix not in valid_prefixes:
-    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
-    sys.exit(1)
-
-  # TODO: validate SPEC
-
 def __with_namespace_defaults(kwargs):
   if not kwargs.get('namespace'):
     kwargs['namespace'] = kwargs.get('workflow_name')
@@ -842,4 +831,4 @@ def __workflow_create(app, **kwargs):
 def __with_workflow_namespace(app: App, namespace: str):
   workflow_namespace = WorkflowNamespace(app, namespace)
   workflow_namespace.copy_dotenv()
-  return workflow_namespace
+  return workflow_namespace

stoobly_agent/app/proxy/handle_record_service.py

@@ -9,7 +9,7 @@ from stoobly_agent.app.settings.constants.mode import TEST
 from stoobly_agent.app.models.request_model import RequestModel
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
 from stoobly_agent.config.constants.env_vars import ENV
-from stoobly_agent.config.constants import lifecycle_hooks, record_order, record_policy
+from stoobly_agent.config.constants import lifecycle_hooks, record_order, record_policy, record_strategy
 from stoobly_agent.lib.logger import Logger
 
 from .constants import custom_response_codes
@@ -19,8 +19,11 @@ from .record.overwrite_scenario_service import overwrite_scenario
 from .record.upload_request_service import inject_upload_request
 from .replay.body_parser_service import is_json, is_xml
 from .utils.allowed_request_service import get_active_mode_policy
+from .utils.minimize_headers import minimize_headers
 from .utils.response_handler import bad_request, disable_transfer_encoding 
 from .utils.rewrite import rewrite_request_response
+from .utils.strategy import get_active_mode_strategy
+
 
 LOG_ID = 'Record'
 
@@ -54,7 +57,7 @@ def handle_response_record(context: RecordContext):
         res = inject_eval_request(request_model, intercept_settings)(request, [])
 
         if res.status_code != custom_response_codes.NOT_FOUND:
-            __record_request(context , request_model)
+            __record_request(context, request_model)
     elif active_record_policy == record_policy.NOT_FOUND:
         res = inject_eval_request(request_model, intercept_settings)(request, [])
 
@@ -74,7 +77,13 @@ def __record_handler(context: RecordContext, request_model: RequestModel):
     intercept_settings = context.intercept_settings
 
     context.flow = flow_copy # Deep copy flow to prevent response modifications from persisting
-    rewrite_request_response(flow_copy, intercept_settings.record_rewrite_rules) 
+
+    active_record_strategy = get_active_mode_strategy(intercept_settings)
+    if active_record_strategy == record_strategy.MINIMAL:
+        minimize_headers(flow_copy)
+
+    rewrite_request_response(flow_copy, intercept_settings.record_rewrite_rules)
+
     __record_hook(lifecycle_hooks.BEFORE_RECORD, context)
 
     inject_upload_request(request_model, intercept_settings)(flow_copy)

stoobly_agent/app/proxy/handle_replay_service.py

@@ -5,9 +5,10 @@ from typing import TypedDict
 
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
 from stoobly_agent.app.proxy.replay.context import ReplayContext
-from stoobly_agent.config.constants import lifecycle_hooks, replay_policy
+from stoobly_agent.config.constants import lifecycle_hooks, replay_policy, custom_headers, mode, record_strategy
 
 from .utils.allowed_request_service import get_active_mode_policy
+from .utils.minimize_headers import minimize_response_headers
 from .utils.rewrite import rewrite_request, rewrite_response
 
 LOG_ID = 'HandleReplay'
@@ -66,7 +67,18 @@ def __rewrite_response(replay_context: ReplayContext):
     After replaying a request, see if the request needs to be rewritten
     """
     intercept_settings: InterceptSettings = replay_context.intercept_settings
+    flow = replay_context.flow
+    request = flow.request
+    response = flow.response
+
+    request_proxy_mode_header = request.headers.get(custom_headers.PROXY_MODE)
+    response_proxy_mode_header = response.headers.get(custom_headers.RESPONSE_PROXY_MODE)
+
+    if request_proxy_mode_header == mode.REPLAY and response_proxy_mode_header == mode.RECORD:
+        if intercept_settings.record_strategy == record_strategy.MINIMAL:
+            minimize_response_headers(flow)
+
     rewrite_rules = intercept_settings.replay_rewrite_rules
 
     if len(rewrite_rules) > 0:
-        rewrite_response(replay_context.flow, rewrite_rules)
+        rewrite_response(flow, rewrite_rules)

stoobly_agent/app/proxy/intercept_settings.py

@@ -57,14 +57,11 @@ class InterceptSettings:
 
   @property
   def active(self):
-    if self.__intercept_settings.active:
-      return True
+    if self.__headers and custom_headers.PROXY_MODE in self.__headers:
+      return not not self.__headers[custom_headers.PROXY_MODE]
 
-    if not self.__headers:
-      return False
+    return self.__intercept_settings.active
     
-    return custom_headers.PROXY_MODE in self.__headers
-
   @property
   def lifecycle_hooks_path(self):
     if self.__headers and custom_headers.LIFECYCLE_HOOKS_PATH in self.__headers:
@@ -182,6 +179,13 @@ class InterceptSettings:
 
     return self.policy
 
+  @property
+  def record_strategy(self):
+    if self.__headers and custom_headers.RECORD_STRATEGY in self.__headers:
+      return self.__headers[custom_headers.RECORD_STRATEGY]
+
+    return self.__data_rules.record_strategy
+
   @property
   def exclude_rules(self) -> List[FirewallRule]:
     _mode = self.mode
@@ -276,7 +280,7 @@ class InterceptSettings:
     if self.__headers and custom_headers.REQUEST_ORIGIN in self.__headers:
       return self.__headers[custom_headers.REQUEST_ORIGIN]
 
-    return request_origin.WEB
+    return request_origin.PROXY
 
   def for_response(self):
     self.__for_response = True
@@ -365,4 +369,4 @@ class InterceptSettings:
 
       return self.__data_rules.test_policy
     elif mode == intercept_mode.REPLAY:
-      return self.__data_rules.replay_policy
+      return self.__data_rules.replay_policy

stoobly_agent/app/proxy/record/upload_request_service.py

@@ -49,7 +49,7 @@ def inject_upload_request(request_model: RequestModel, intercept_settings: Inter
 def upload_request(
     request_model: RequestModel, intercept_settings: InterceptSettings, flow: MitmproxyHTTPFlow = None
 ):
-    Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN}Recording{bcolors.ENDC} {flow.request.url}")
+    Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Recording{bcolors.ENDC} {flow.request.url}")
 
     flow_copy = deepcopy(flow) # When applying modifications we don't want to persist them in the response
     joined_request = join_request_from_flow(flow_copy, intercept_settings=intercept_settings)
@@ -63,10 +63,7 @@ def upload_request(
         scenario_key=scenario_key
     )
 
-    # If request_origin is WEB, then we are in proxy
-    # This means that we have access to Cache singleton and do not need send a request to update the status
-    sync = intercept_settings.request_origin == request_origin.WEB
-    res = __upload_request_with_body_params(request_model, body_params, sync)
+    res = __upload_request_with_body_params(request_model, body_params)
 
     if intercept_settings.settings.is_debug():
         file_path = __debug_request(flow.request, joined_request.build())
@@ -80,7 +77,7 @@ def upload_request(
 def upload_staged_request(
     request: Request, request_model: RequestModel, project_key: str, scenario_key: str = None
 ):
-    Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN}Recording{bcolors.ENDC} {request.url}")
+    Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Recording{bcolors.ENDC} {request.url}")
 
     response = request.response
 
@@ -107,11 +104,11 @@ def upload_staged_request(
 
     return __upload_request_with_body_params(request_model, body_params)
 
-def __upload_request_with_body_params(request_model: RequestModel, body_params: dict, sync=True):
+def __upload_request_with_body_params(request_model: RequestModel, body_params: dict):
     request, status = request_model.create(**body_params)
 
     if status < 400:
-        publish_requests_modified(body_params['project_id'], sync=sync)
+        publish_requests_modified(body_params['project_id'])
 
         return request
 

stoobly_agent/app/proxy/replay/replay_request_service.py

@@ -72,6 +72,9 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
   if options.get('public_directory_path'):
     __handle_path_header(custom_headers.PUBLIC_DIRECTORY_PATH, options['public_directory_path'], headers)
 
+  if options.get('record_strategy'):
+    headers[custom_headers.RECORD_STRATEGY] = options['record_strategy']
+
   if options.get('report_key'):
     headers[custom_headers.REPORT_KEY] = options['report_key']
 

stoobly_agent/app/proxy/run.py

@@ -16,8 +16,6 @@ tls.DEFAULT_OPTIONS |= 0x4
 from mitmproxy.options import Options
 from mitmproxy.tools.dump import DumpMaster
 
-from stoobly_agent.app.settings import Settings
-
 INTERCEPT_HANDLER_FILENAME = 'intercept_handler.py'
 
 def run(**kwargs):
@@ -67,7 +65,6 @@ def __with_static_options(config: MitmproxyConfig, cli_options):
     config.set(options)
 
 def __with_cli_options(config: MitmproxyConfig, cli_options: dict):
-    __commit_options(cli_options)
     __filter_options(cli_options)
 
     options = []
@@ -86,31 +83,6 @@ def __with_cli_options(config: MitmproxyConfig, cli_options: dict):
 
     config.set(tuple(options))
 
-def __commit_options(options: dict):
-    changed = False
-    service_name = os.environ.get(SERVICE_NAME_ENV)
-    settings = Settings.instance()
-
-    if not service_name or options.get('intercept'):
-        # In the case when service name is set,
-        # only update if intercept is explicitly enabled
-        intercept = not not options.get('intercept')
-        changed = settings.proxy.intercept.active != intercept
-        settings.proxy.intercept.active = intercept
-
-    if not service_name or service_name == CORE_MOCK_UI_SERVICE_NAME:
-        # Causes potentially unintended side effects when run as part of scaffold
-        # Defer to ui service for configuration in this case
-        if options.get('proxy_host') and options.get('proxy_port'):
-            settings.proxy.url = f"http://{options.get('proxy_host')}:{options.get('proxy_port')}"
-
-        settings.ui.active = not options.get('headless')
-
-        changed = True
-
-    if changed:
-        settings.commit()
-
 def __filter_options(options):
     ''' 
     Filter out non-mitmproxy options
@@ -139,6 +111,9 @@ def __filter_options(options):
     if 'intercept' in options:
         del options['intercept']
 
+    if 'intercept_mode' in options:
+        del options['intercept_mode']
+
     if 'lifecycle_hooks_path' in options:
         del options['lifecycle_hooks_path']
 

stoobly_agent/app/proxy/utils/allowed_request_service.py

@@ -5,13 +5,14 @@ from mitmproxy.http import Request as MitmproxyRequest
 from typing import List
 
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
+from stoobly_agent.app.settings.constants import intercept_mode
 from stoobly_agent.app.settings.firewall_rule import FirewallRule
-from stoobly_agent.config.constants import intercept_policy, request_origin
+from stoobly_agent.config.constants import mode, intercept_policy, request_origin
 from stoobly_agent.lib.logger import bcolors, Logger
 
 LOG_ID = 'Firewall'
 
-def get_active_mode_policy(request: MitmproxyRequest, intercept_settings: InterceptSettings):
+def get_active_mode_policy(request: MitmproxyRequest, intercept_settings: InterceptSettings) -> str:
     if intercept_settings.request_origin == request_origin.CLI:
         return intercept_settings.policy