codeplain 0.2.14__tar.gz → 0.2.15__tar.gz

codeplain-0.2.15/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(gh pr:*)"
+    ]
+  }
+}

{codeplain-0.2.14 → codeplain-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.2.14
+Version: 0.2.15
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console

codeplain-0.2.15/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.15"

{codeplain-0.2.14 → codeplain-0.2.15}/codeplain_REST_api.py

@@ -18,7 +18,7 @@ RETRY_ERROR_CODES = [
 ERROR_CODE_EXCEPTIONS = {
     "FunctionalRequirementTooComplex": plain2code_exceptions.FunctionalRequirementTooComplex,
     "ConflictingRequirements": plain2code_exceptions.ConflictingRequirements,
-    "CreditBalanceTooLow": plain2code_exceptions.CreditBalanceTooLow,
+    "CreditBalanceTooLow": plain2code_exceptions.RenderingCreditBalanceTooLow,
     "LLMInternalError": plain2code_exceptions.LLMInternalError,
     "MissingResource": plain2code_exceptions.MissingResource,
     "PlainSyntaxError": plain2code_exceptions.PlainSyntaxError,
@@ -67,8 +67,8 @@ class CodeplainAPI:
         connection_error_type = "Network error" if is_connection_error else "Error"
         if attempt < num_retries:
             if not silent:
-                self.console.info(f"{connection_error_type} on attempt {attempt + 1}/{num_retries + 1}: {error}")
-                self.console.info(f"Retrying in {retry_delay} seconds...")
+                self.console.debug(f"{connection_error_type} on attempt {attempt + 1}/{num_retries + 1}: {error}")
+                self.console.debug(f"Retrying in {retry_delay} seconds...")
             time.sleep(retry_delay)
             # Exponential backoff
             return retry_delay * 2
@@ -117,7 +117,7 @@ class CodeplainAPI:
                 try:
                     response_json = response.json()
                 except requests.exceptions.JSONDecodeError as e:
-                    print(f"Failed to decode JSON response: {e}. Response text: {response.text}")
+                    self.console.debug(f"Failed to decode JSON response: {e}. Response text: {response.text}")
                     raise
 
                 if response.status_code == requests.codes.bad_request and "error_code" in response_json:
@@ -156,11 +156,11 @@ class CodeplainAPI:
         run_state: RunState,
     ) -> dict[str, str]:
         """
-        Renders the content of a functional requirement based on the provided ID,
+        Renders the content of a functionality based on the provided ID,
         corresponding sections from a Plain document, and existing files' content.
 
         Args:
-            frid (str): The unique identifier for the functional requirement to be rendered.
+            frid (str): The unique identifier for the functionality to be rendered.
             plain_source_tree (dict): A dictionary containing the plain source tree.
             linked_resources (dict): A dictionary where the keys represent filenames of linked
                                         resources and the values are dictionaries containing
@@ -170,7 +170,7 @@ class CodeplainAPI:
                                         and the values are the content of those files.
             memory_files_content (dict): A dictionary where the keys represent memory filenames
                                         and the values are the content of those files.
-            module_name (str): The name of the module to render the functional requirement for.
+            module_name (str): The name of the module to render the functionality for.
             required_modules (dict): A dictionary where the keys represent module names
                                      and the values are lists of functionalities implemented in those modules.
             run_state (RunState): The current state of the rendering process.
@@ -390,7 +390,7 @@ class CodeplainAPI:
         Renders acceptance tests based on the provided parameters.
 
         Args:
-            frid (str): The unique identifier for the functional requirement.
+            frid (str): The unique identifier for the functionality.
             plain_source_tree (dict): A dictionary containing the plain source tree.
             linked_resources (dict): A dictionary where the keys represent resource names
                                     and the values are the content of those resources.

codeplain-0.2.15/docs/generate_cli.py

@@ -0,0 +1,25 @@
+import os
+import sys
+
+# Add the parent directory to the path so we can import plain2code_arguments
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+def main():
+    from plain2code_arguments import create_parser
+
+    # Get the parser and generate help text
+    parser = create_parser(color=False)  # Disable color for markdown output
+    help_text = parser.format_help()
+
+    # Create markdown
+    md = "# Plain2Code CLI Reference\n\n```text\n" + help_text + "\n```"
+
+    # Run generate_cli.py in the docs folder
+
+    with open("plain2code_cli.md", "w", encoding="utf-8") as f:
+        f.write(md)
+
+
+if __name__ == "__main__":
+    main()

{codeplain-0.2.14 → codeplain-0.2.15}/docs/plain2code_cli.md

@@ -1,18 +1,22 @@
 # Plain2Code CLI Reference
 
 ```text
-usage: generate_cli.py [-h] [--verbose] [--base-folder BASE_FOLDER] [--build-folder BUILD_FOLDER] [--log-to-file | --no-log-to-file] [--log-file-name LOG_FILE_NAME] [--config-name CONFIG_NAME]
-                       [--render-range RENDER_RANGE | --render-from RENDER_FROM] [--force-render] [--unittests-script UNITTESTS_SCRIPT] [--conformance-tests-folder CONFORMANCE_TESTS_FOLDER]
-                       [--conformance-tests-script CONFORMANCE_TESTS_SCRIPT] [--prepare-environment-script PREPARE_ENVIRONMENT_SCRIPT] [--test-script-timeout TEST_SCRIPT_TIMEOUT] [--api [API]] [--api-key API_KEY]
-                       [--full-plain] [--dry-run] [--replay-with REPLAY_WITH] [--template-dir TEMPLATE_DIR] [--copy-build] [--build-dest BUILD_DEST] [--copy-conformance-tests]
-                       [--conformance-tests-dest CONFORMANCE_TESTS_DEST] [--render-machine-graph] [--logging-config-path] [--headless]
+usage: generate_cli.py [-h] [--verbose] [--base-folder BASE_FOLDER] [--build-folder BUILD_FOLDER] [--log-to-file | --no-log-to-file]
+                       [--log-file-name LOG_FILE_NAME] [--config-name CONFIG_NAME] [--render-range RENDER_RANGE | --render-from RENDER_FROM]
+                       [--force-render] [--unittests-script UNITTESTS_SCRIPT] [--conformance-tests-folder CONFORMANCE_TESTS_FOLDER]
+                       [--conformance-tests-script CONFORMANCE_TESTS_SCRIPT] [--prepare-environment-script PREPARE_ENVIRONMENT_SCRIPT]
+                       [--test-script-timeout TEST_SCRIPT_TIMEOUT] [--api [API]] [--api-key API_KEY] [--full-plain] [--dry-run]
+                       [--replay-with REPLAY_WITH] [--template-dir TEMPLATE_DIR] [--copy-build] [--build-dest BUILD_DEST]
+                       [--copy-conformance-tests] [--conformance-tests-dest CONFORMANCE_TESTS_DEST] [--render-machine-graph]
+                       [--logging-config-path LOGGING_CONFIG_PATH] [--headless]
                        filename
 
 Render plain code to target code.
 
 positional arguments:
-  filename              Path to the plain file to render. The directory containing this file has highest precedence for template loading, so you can place custom templates here to override the defaults. See --template-dir
-                        for more details about template loading.
+  filename              Path to the plain file to render. The directory containing this file has highest precedence for template loading, so
+                        you can place custom templates here to override the defaults. See --template-dir for more details about template
+                        loading.
 
 options:
   -h, --help            show this help message and exit
@@ -24,49 +28,58 @@ options:
   --log-to-file, --no-log-to-file
                         Enable logging to a file. Defaults to True. Set to False to disable.
   --log-file-name LOG_FILE_NAME
-                        Name of the log file. Defaults to 'codeplain.log'.Always resolved relative to the plain file directory.If file on this path already exists, the already existing log file will be overwritten by the
-                        current logs.
+                        Name of the log file. Defaults to 'codeplain.log'.Always resolved relative to the plain file directory.If file on
+                        this path already exists, the already existing log file will be overwritten by the current logs.
   --render-range RENDER_RANGE
-                        Specify a range of functional requirements to render (e.g. `1` , `2`, `3`). Use comma to separate start and end IDs. If only one ID is provided, only that requirement is rendered. Range is
-                        inclusive of both start and end IDs.
+                        Specify a range of functionalities to render (e.g. `1` , `2`, `3`). Use comma to separate start and end IDs. If only
+                        one functionality ID is provided, only that functionality is rendered. Range is inclusive of both start and end IDs.
   --render-from RENDER_FROM
-                        Continue generation starting from this specific functional requirement (e.g. `2`). The requirement with this ID will be included in the output. The ID must match one of the functional requirements
-                        in your plain file.
+                        Continue generation starting from this specific functionality (e.g. `2`). The functionality with this ID will be
+                        included in the output. The functionality ID must match one of the functionalities in your plain file.
   --force-render        Force re-render of all the required modules.
   --unittests-script UNITTESTS_SCRIPT
-                        Shell script to run unit tests on generated code. Receives the build folder path as its first argument (default: 'plain_modules').
+                        Shell script to run unit tests on generated code. Receives the build folder path as its first argument (default:
+                        'plain_modules').
   --conformance-tests-folder CONFORMANCE_TESTS_FOLDER
                         Folder for conformance test files
   --conformance-tests-script CONFORMANCE_TESTS_SCRIPT
-                        Path to conformance tests shell script. Every conformance test script should accept two arguments: 1) Path to a folder (e.g. `plain_modules/module_name`) containing generated source code, 2) Path
-                        to a subfolder of the conformance tests folder (e.g. `conformance_tests/subfoldername`) containing test files.
+                        Path to conformance tests shell script. Every conformance test script should accept two arguments: 1) Path to a
+                        folder (e.g. `plain_modules/module_name`) containing generated source code, 2) Path to a subfolder of the conformance
+                        tests folder (e.g. `conformance_tests/subfoldername`) containing test files.
   --prepare-environment-script PREPARE_ENVIRONMENT_SCRIPT
-                        Path to a shell script that prepares the testing environment. The script should accept the source code folder path as its first argument.
+                        Path to a shell script that prepares the testing environment. The script should accept the source code folder path as
+                        its first argument.
   --test-script-timeout TEST_SCRIPT_TIMEOUT
                         Timeout for test scripts in seconds. If not provided, the default timeout of 120 seconds is used.
   --api [API]           Alternative base URL for the API. Default: `https://api.codeplain.ai`
   --api-key API_KEY     API key used to access the API. If not provided, the `CODEPLAIN_API_KEY` environment variable is used.
-  --full-plain          Full preview ***plain specification before code generation.Use when you want to preview context of all ***plain primitives that are going to be included in order to render the given module.
+  --full-plain          Full preview ***plain specification before code generation.Use when you want to preview context of all ***plain
+                        primitives that are going to be included in order to render the given module.
   --dry-run             Dry run preview of the code generation (without actually making any changes).
   --replay-with REPLAY_WITH
   --template-dir TEMPLATE_DIR
-                        Path to a custom template directory. Templates are searched in the following order: 1) Directory containing the plain file, 2) Custom template directory (if provided through this argument), 3)
-                        Built-in standard_template_library directory
-  --copy-build          If set, copy the rendered contents of code in `--base-folder` folder to `--build-dest` folder after successful rendering.
+                        Path to a custom template directory. Templates are searched in the following order: 1) Directory containing the plain
+                        file, 2) Custom template directory (if provided through this argument), 3) Built-in standard_template_library
+                        directory
+  --copy-build          If set, copy the rendered contents of code in `--base-folder` folder to `--build-dest` folder after successful
+                        rendering.
   --build-dest BUILD_DEST
                         Target folder to copy rendered contents of code to (used only if --copy-build is set).
   --copy-conformance-tests
-                        If set, copy the conformance tests of code in `--conformance-tests-folder` folder to `--conformance-tests-dest` folder successful rendering. Requires --conformance-tests-script.
+                        If set, copy the conformance tests of code in `--conformance-tests-folder` folder to `--conformance-tests-dest`
+                        folder successful rendering. Requires --conformance-tests-script.
   --conformance-tests-dest CONFORMANCE_TESTS_DEST
                         Target folder to copy conformance tests of code to (used only if --copy-conformance-tests is set).
   --render-machine-graph
                         If set, render the state machine graph.
-  --logging-config-path
+  --logging-config-path LOGGING_CONFIG_PATH
                         Path to the logging configuration file.
-  --headless            Run in headless mode: no TUI, no terminal output except a single render-started message. All logs are written to the log file.
+  --headless            Run in headless mode: no TUI, no terminal output except a single render-started message. All logs are written to the
+                        log file.
 
 configuration:
   --config-name CONFIG_NAME
-                        Path to the config file, defaults to config.yaml
+                        Name of the config file to look for. Looked up in the plain file directory and the current working directory.
+                        Defaults to config.yaml.
 
 ```

{codeplain-0.2.14 → codeplain-0.2.15}/event_bus.py

@@ -7,11 +7,6 @@ from plain2code_events import BaseEvent
 class EventBus:
     def __init__(self):
         self._listeners: defaultdict[Type[BaseEvent], list[Callable[[Any], None]]] = defaultdict(list)
-        self._dispatch_wrapper: Callable[[Callable], None] | None = None
-
-    def register_dispatch_wrapper(self, fn: Callable[[Callable], None]):
-        """Set a wrapper for dispatching listeners (e.g., Textual's app.call_from_thread)."""
-        self._dispatch_wrapper = fn
 
     def subscribe(self, event_type: Type[BaseEvent], listener: Callable[[Any], None]):
         """Registers a listener for a specific event type."""
@@ -19,12 +14,5 @@ class EventBus:
 
     def publish(self, event: BaseEvent):
         """Publishes an event to all registered listeners."""
-
-        def _dispatch():
-            for listener in self._listeners[type(event)]:
-                listener(event)
-
-        if self._dispatch_wrapper:
-            self._dispatch_wrapper(_dispatch)
-        else:
-            _dispatch()
+        for listener in self._listeners[type(event)]:
+            listener(event)

{codeplain-0.2.14 → codeplain-0.2.15}/file_utils.py

@@ -7,6 +7,7 @@ from liquid2 import Environment, FileSystemLoader, StrictUndefined
 from liquid2.exceptions import UndefinedError
 
 import plain_spec
+from plain2code_console import console
 from plain2code_nodes import Plain2CodeIncludeTag, Plain2CodeLoaderMixin
 from plain_modules import CODEPLAIN_MEMORY_SUBFOLDER, CODEPLAIN_METADATA_FOLDER
 
@@ -79,7 +80,7 @@ def list_all_text_files(directory):
                     with open(os.path.join(root, filename), "rb") as f:
                         f.read().decode("utf-8")
                 except UnicodeDecodeError:
-                    print(f"WARNING! Not listing {filename} in {root}. File is not a text file. Skipping it.")
+                    console.debug(f"WARNING! Not listing {filename} in {root}. File is not a text file. Skipping it.")
                     continue
 
                 all_files.append(os.path.join(modified_root, filename))
@@ -178,7 +179,7 @@ def get_existing_files_content(build_folder, existing_files):
             try:
                 existing_files_content[file_name] = content.decode("utf-8")
             except UnicodeDecodeError:
-                print(f"WARNING! Error loading {file_name}. File is not a text file. Skipping it.")
+                console.debug(f"WARNING! Error loading {file_name}. File is not a text file. Skipping it.")
 
     return existing_files_content
 
@@ -193,7 +194,7 @@ def store_response_files(target_folder, response_files, existing_files):
                 os.remove(full_file_name)
                 existing_files.remove(file_name)
             else:
-                print(f"WARNING! Cannot delete file! File {full_file_name} does not exist.")
+                console.debug(f"WARNING! Cannot delete file! File {full_file_name} does not exist.")
 
             continue
 
@@ -219,7 +220,9 @@ def open_from(dirs, file_name):
             try:
                 content_text = content.decode("utf-8")
             except UnicodeDecodeError:
-                print(f"WARNING! Error loading {file_name} ({file_name}). File is not a text file. Skipping it.")
+                console.debug(
+                    f"WARNING! Error loading {file_name} ({file_name}). File is not a text file. Skipping it."
+                )
             return content_text
 
     return None

{codeplain-0.2.14 → codeplain-0.2.15}/git_utils.py

@@ -7,22 +7,20 @@ from git import Repo
 import file_utils
 from plain2code_exceptions import InvalidGitRepositoryError
 
-FUNCTIONAL_REQUIREMENT_IMPLEMENTED_COMMIT_MESSAGE = (
-    "[Codeplain] Implemented code and unit tests for functional requirement {}"
-)
-REFACTORED_CODE_COMMIT_MESSAGE = "[Codeplain] Refactored code after implementing functional requirement {}"
+FUNCTIONAL_REQUIREMENT_IMPLEMENTED_COMMIT_MESSAGE = "[Codeplain] Implemented code and unit tests for functionality {}"
+REFACTORED_CODE_COMMIT_MESSAGE = "[Codeplain] Refactored code after implementing functionality {}"
 CONFORMANCE_TESTS_PASSED_COMMIT_MESSAGE = (
     "[Codeplain] Fixed issues in the implementation code identified during conformance testing"
 )
 
 # Following messages are used as checkpoints in the git history
 # Changing them will break backwards compatibility so change them with care
-FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE = "[Codeplain] Functional requirement ID (FRID):{} fully implemented"
+FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE = "[Codeplain] functionality ID (FRID):{} fully implemented"
 INITIAL_COMMIT_MESSAGE = "[Codeplain] Initial module commit"
 BASE_FOLDER_COMMIT_MESSAGE = "[Codeplain] Initialize build with Base Folder content"
 
 
-RENDERED_FRID_MESSAGE = "Changes related to Functional requirement ID (FRID): {}"
+RENDERED_FRID_MESSAGE = "Changes related to functionality ID (FRID): {}"
 MODULE_NAME_MESSAGE = "Module name: {}"
 RENDER_ID_MESSAGE = "Render ID: {}"
 
@@ -244,7 +242,7 @@ def diff(repo_path: Union[str, os.PathLike], previous_frid: str = None) -> dict:
 
     Args:
         repo_path (str | os.PathLike): Path to the git repository
-        previous_frid (str): Functional requirement ID (FRID) of the previous commit
+        previous_frid (str): functionality ID (FRID) of the previous commit
 
     Returns:
         dict: Dictionary with file names as keys and their clean diff strings as values
@@ -285,7 +283,7 @@ def _get_commit_with_frid(repo: Repo, frid: str, module_name: Optional[str] = No
 
     Args:
         repo (Repo): Git repository object
-        frid (str): Functional requirement ID
+        frid (str): functionality ID
         module_name (Optional[str]): Module name to filter by. If provided, only returns
                                       commits that have both the FRID and module name.
 

{codeplain-0.2.14 → codeplain-0.2.15}/install/bash/install.sh

@@ -223,7 +223,7 @@ echo -e "  thank you for using ${YELLOW}*codeplain!${NC}"
 echo ""
 echo -e "  ${BOLD}next steps:${NC}"
 echo ""
-echo -e "  join our Discord community: ${YELLOW}https://discord.gg/4qQJaMu7Y${NC}"
+echo -e "  join our Discord community: ${YELLOW}https://discord.gg/cgbynb9hFq${NC}"
 echo ""
 echo -e "  learn more about ${YELLOW}***plain${NC} at ${YELLOW}https://plainlang.org/${NC}"
 echo ""

{codeplain-0.2.14 → codeplain-0.2.15}/install/powershell/install.ps1

@@ -255,7 +255,7 @@ Write-Host "  thank you for using ${YELLOW}*codeplain!${NC}"
 Write-Host ""
 Write-Host "  ${BOLD}next steps:${NC}"
 Write-Host ""
-Write-Host "  join our Discord community: ${YELLOW}https://discord.gg/4qQJaMu7Y${NC}"
+Write-Host "  join our Discord community: ${YELLOW}https://discord.gg/cgbynb9hFq${NC}"
 Write-Host ""
 Write-Host "  learn more about ${YELLOW}***plain${NC} at ${YELLOW}https://plainlang.org/${NC}"
 Write-Host ""

{codeplain-0.2.14 → codeplain-0.2.15}/memory_management.py

@@ -21,7 +21,7 @@ class MemoryManager:
             return [], {}
         memory_files = file_utils.list_all_text_files(memory_path)
         memory_files_content = file_utils.get_existing_files_content(memory_path, memory_files)
-        console.info(f"Loaded {len(memory_files_content)} memory files.")
+        console.debug(f"Loaded {len(memory_files_content)} memory files.")
         return memory_files, memory_files_content
 
     def __init__(self, codeplain_api, module_build_folder: str):

{codeplain-0.2.14 → codeplain-0.2.15}/module_renderer.py

@@ -1,5 +1,6 @@
 import argparse
 import os
+import threading
 
 import git_utils
 import plain_file
@@ -28,6 +29,8 @@ class ModuleRenderer:
         args: argparse.Namespace,
         run_state: RunState,
         event_bus: EventBus,
+        stop_event: threading.Event | None = None,
+        enter_pause_event: threading.Event | None = None,
     ):
         self.codeplainAPI = codeplainAPI
         self.filename = filename
@@ -36,6 +39,8 @@ class ModuleRenderer:
         self.args = args
         self.run_state = run_state
         self.event_bus = event_bus
+        self.stop_event = stop_event
+        self.enter_pause_event = enter_pause_event
 
     def _ensure_module_folders_exist(self, module_name: str, first_render_frid: str) -> tuple[str, str]:
         """
@@ -177,6 +182,8 @@ class ModuleRenderer:
             run_state=self.run_state,
             event_bus=self.event_bus,
             test_script_timeout=self.args.test_script_timeout,
+            stop_event=self.stop_event,
+            enter_pause_event=self.enter_pause_event,
         )
 
     def _render_module(
@@ -199,7 +206,7 @@ class ModuleRenderer:
         required_modules = []
         has_any_required_module_changed = False
         if not self.args.render_machine_graph and required_modules_list:
-            console.info(f"Analyzing required modules of module {module_name}...")
+            console.debug(f"Analyzing required modules of module {module_name}...")
             for required_module_name in required_modules_list:
                 required_module_filename = required_module_name + plain_file.PLAIN_SOURCE_FILE_EXTENSION
                 has_module_changed, sub_required_modules, rendering_failed = self._render_module(

{codeplain-0.2.14 → codeplain-0.2.15}/plain2code.py

@@ -2,6 +2,7 @@ import importlib.resources
 import logging
 import logging.config
 import os
+import signal
 import sys
 import threading
 from pathlib import Path
@@ -22,7 +23,6 @@ from plain2code_console import console
 from plain2code_events import RenderFailed
 from plain2code_exceptions import (
     ConflictingRequirements,
-    CreditBalanceTooLow,
     InternalClientError,
     InternalServerError,
     InvalidAPIKey,
@@ -35,11 +35,13 @@ from plain2code_exceptions import (
     NetworkConnectionError,
     OutdatedClientVersion,
     PlainSyntaxError,
+    RenderCancelledError,
+    RenderingCreditBalanceTooLow,
 )
 from plain2code_logger import (
+    LOGGER_NAME,
     CrashLogHandler,
     IndentedFormatter,
-    RetryOnlyFilter,
     TuiLoggingHandler,
     dump_crash_logs,
     get_log_file_path,
@@ -50,6 +52,7 @@ from system_config import system_config
 from tui.plain2code_tui import Plain2CodeTUI
 
 DEFAULT_TEMPLATE_DIRS = importlib.resources.files("standard_template_library")
+RENDER_THREAD_SHUTDOWN_TIMEOUT = 0.7
 
 
 def get_render_range(render_range, plain_source):
@@ -86,12 +89,12 @@ def _get_frids_range(plain_source, start, end=None):
     start = str(start)
 
     if start not in frids:
-        raise InvalidFridArgument(f"Invalid start functional requirement ID: {start}. Valid IDs are: {frids}.")
+        raise InvalidFridArgument(f"Invalid start functionality ID: {start}. Valid IDs are: {frids}.")
 
     if end is not None:
         end = str(end)
         if end not in frids:
-            raise InvalidFridArgument(f"Invalid end functional requirement ID: {end}. Valid IDs are: {frids}.")
+            raise InvalidFridArgument(f"Invalid end functionality ID: {end}. Valid IDs are: {frids}.")
 
         end_idx = frids.index(end) + 1
     else:
@@ -99,9 +102,7 @@ def _get_frids_range(plain_source, start, end=None):
 
     start_idx = frids.index(start)
     if start_idx >= end_idx:
-        raise InvalidFridArgument(
-            f"Start functional requirement ID: {start} must be before end functional requirement ID: {end}."
-        )
+        raise InvalidFridArgument(f"Start functionality ID: {start} must be before end functionality ID: {end}.")
 
     return frids[start_idx:end_idx]
 
@@ -112,20 +113,12 @@ def setup_logging(
     log_to_file: bool,
     log_file_name: str,
     plain_file_path: Optional[str],
-    render_id: str,
     headless: bool = False,
 ):
     # Set default level to INFO for everything not explicitly configured
     logging.getLogger().setLevel(logging.INFO)
-    logging.getLogger("urllib3").setLevel(logging.WARNING)
-    logging.getLogger("httpx").setLevel(logging.WARNING)
-    logging.getLogger("httpcore").setLevel(logging.WARNING)
-    logging.getLogger("anthropic").setLevel(logging.WARNING)
-    logging.getLogger("langsmith").setLevel(logging.WARNING)
+    logging.getLogger(LOGGER_NAME).setLevel(logging.INFO)
     logging.getLogger("git").setLevel(logging.WARNING)
-    logging.getLogger("anthropic._base_client").setLevel(logging.WARNING)
-    logging.getLogger("services.langsmith.langsmith_service").setLevel(logging.WARNING)
-    logging.getLogger("repositories").setLevel(logging.WARNING)
     logging.getLogger("transitions").setLevel(logging.ERROR)
     logging.getLogger("transitions.extensions.diagrams").setLevel(logging.ERROR)
 
@@ -141,18 +134,11 @@ def setup_logging(
         except Exception as e:
             console.warning(f"Failed to load logging configuration from {args.logging_config_path}: {str(e)}")
 
-    # Allow detailed retry logs for anthropic if needed
-    logging.getLogger("anthropic._base_client").setLevel(logging.DEBUG)
-    if logging.getLogger("anthropic._base_client").level == logging.DEBUG:
-        logging.getLogger("anthropic._base_client").addFilter(RetryOnlyFilter())
-
     # The IndentedFormatter provides better multiline log readability.
     # We add the TuiLoggingHandler to the root logger.
-    # CRITICAL: We must remove existing handlers (like StreamHandler) to prevent double-logging
-    # that spills into the TUI dashboard.
-    root_logger = logging.getLogger()
-    for h in root_logger.handlers[:]:
-        root_logger.removeHandler(h)
+    root_logger = logging.getLogger(LOGGER_NAME)
+    configured_log_level = root_logger.level
+    root_logger.setLevel(logging.DEBUG)  # Capture all logs; handlers will filter levels as needed
 
     formatter = IndentedFormatter("%(levelname)s:%(name)s:%(message)s")
 
@@ -165,6 +151,7 @@ def setup_logging(
         try:
             file_handler = logging.FileHandler(log_file_path, mode="w")
             file_handler.setFormatter(formatter)
+            file_handler.setLevel(configured_log_level)
             root_logger.addHandler(file_handler)
         except Exception as e:
             console.warning(f"Failed to setup file logging to {log_file_path}: {str(e)}")
@@ -173,10 +160,9 @@ def setup_logging(
         # in case we need to dump them on crash.
         crash_handler = CrashLogHandler()
         crash_handler.setFormatter(formatter)
+        crash_handler.setLevel(configured_log_level)
         root_logger.addHandler(crash_handler)
 
-    root_logger.info(f"Render ID: {render_id}")  # Ensure render ID is logged in to codeplain.log file
-
 
 def _check_connection(codeplainAPI: codeplain_api.CodeplainAPI):
     """Check API connectivity and validate API key and client version."""
@@ -216,6 +202,10 @@ def render(args, run_state: RunState, event_bus: EventBus):  # noqa: C901
 
     _check_connection(codeplainAPI)
 
+    stop_event = threading.Event()
+    enter_pause_event = threading.Event()
+    signal.signal(signal.SIGTERM, lambda _signum, _frame: stop_event.set())
+
     module_renderer = ModuleRenderer(
         codeplainAPI,
         args.filename,
@@ -224,6 +214,8 @@ def render(args, run_state: RunState, event_bus: EventBus):  # noqa: C901
         args,
         run_state,
         event_bus,
+        stop_event=stop_event,
+        enter_pause_event=enter_pause_event,
     )
 
     render_error: list[Exception] = []
@@ -231,13 +223,19 @@ def render(args, run_state: RunState, event_bus: EventBus):  # noqa: C901
     def run_render():
         try:
             module_renderer.render_module()
+            console.info(f"[#79FC96]Render {run_state.render_id} completed successfully.[/#79FC96]")
+        except RenderCancelledError:
+            pass  # TUI already closed, nothing to report
         except Exception as e:
             render_error.append(e)
             event_bus.publish(RenderFailed(error_message=str(e)))
 
     if args.headless:
-        print(f"Render started. Render ID: {run_state.render_id}")
-        module_renderer.render_module()
+        console.info(f"Render started. Render ID: {run_state.render_id}")
+        try:
+            module_renderer.render_module()
+        except RenderCancelledError:
+            pass
         return
     else:
         render_thread = threading.Thread(target=run_render, daemon=True)
@@ -249,10 +247,12 @@ def render(args, run_state: RunState, event_bus: EventBus):  # noqa: C901
             conformance_tests_script=args.conformance_tests_script,
             prepare_environment_script=args.prepare_environment_script,
             state_machine_version=system_config.client_version,
+            enter_pause_event=enter_pause_event,
             css_path="styles.css",
         )
         app.run()
-        render_thread.join(timeout=1)
+        stop_event.set()
+        render_thread.join(timeout=RENDER_THREAD_SHUTDOWN_TIMEOUT)
 
     if render_error:
         raise render_error[0]
@@ -295,9 +295,7 @@ def main():  # noqa: C901
         # Suppress Rich console output.
         console.quiet = True
 
-    setup_logging(
-        args, event_bus, args.log_to_file, args.log_file_name, args.filename, run_state.render_id, args.headless
-    )
+    setup_logging(args, event_bus, args.log_to_file, args.log_file_name, args.filename, args.headless)
 
     exc_info = None
     try:
@@ -307,7 +305,7 @@ def main():  # noqa: C901
                 "API key is required. Please set the CODEPLAIN_API_KEY environment variable or provide it with the --api-key argument."
             )
 
-        console.debug(f"Render ID: {run_state.render_id}")  # Ensure render ID is logged to the console
+        console.info(f"Render ID: {run_state.render_id}")
         render(args, run_state, event_bus)
     except InvalidFridArgument as e:
         exc_info = sys.exc_info()
@@ -351,7 +349,7 @@ def main():  # noqa: C901
         exc_info = sys.exc_info()
         console.error(f"Conflicting requirements: {str(e)}\n")
         console.debug(f"Render ID: {run_state.render_id}")
-    except CreditBalanceTooLow as e:
+    except RenderingCreditBalanceTooLow as e:
         exc_info = sys.exc_info()
         console.error(f"Credit balance too low: {str(e)}\n")
         console.debug(f"Render ID: {run_state.render_id}")