codeplain 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

_version.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.3.3"

cli_output/status.py

@@ -50,8 +50,8 @@ def _display_credit_line(plan_credits: dict) -> None:
         console.print(f"    {plan_label:10} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
 
 
-def _display_purchased_credit_line(bucket: dict) -> None:
-    """Display a purchased credit line with progress bar."""
+def _display_bucket_credit_line(bucket: dict, label: str) -> None:
+    """Display a credit bucket line (purchased or promo) with progress bar."""
     remaining = bucket["remaining"]
     total = bucket["total"]
     expiry_date = bucket["expiry_date"]
@@ -71,12 +71,12 @@ def _display_purchased_credit_line(bucket: dict) -> None:
     bar = _create_progress_bar(remaining, total, width=30)
 
     if is_expired:
-        console.print(f"    Purchased  {bar}   expired {formatted_date}")
+        console.print(f"    {label:10} {bar}   expired {formatted_date}")
     else:
-        console.print(f"    Purchased  {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
+        console.print(f"    {label:10} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
 
 
-def _display_status_message(plan_credits: Optional[dict], purchased_credits: list) -> None:
+def _display_status_message(plan_credits: Optional[dict], purchased_credits: list, promo_credits: list) -> None:
     """Display appropriate status message based on credit state."""
     has_remaining = False
 
@@ -93,8 +93,8 @@ def _display_status_message(plan_credits: Optional[dict], purchased_credits: lis
         if remaining > 0 and period_end > now:
             has_remaining = True
 
-    # Check if any purchased credits have remaining balance and not expired
-    for bucket in purchased_credits:
+    # Check if any purchased or promo credits have remaining balance and not expired
+    for bucket in [*purchased_credits, *promo_credits]:
         dt_str = bucket["expiry_date"].replace("Z", "+00:00")
         expiry_date = datetime.fromisoformat(dt_str)
         # If naive datetime, assume UTC
@@ -127,6 +127,7 @@ def print_status(api_key: str, api_url: str, client_version: str) -> None:
     org_owner = response.get("organization_owner_email")
     plan_credits = response.get("plan_credits")
     purchased_credits = response.get("purchased_credits", [])
+    promo_credits = response.get("promo_credits", [])
 
     # Display header information
     if client_version_valid:
@@ -153,8 +154,12 @@ def print_status(api_key: str, api_url: str, client_version: str) -> None:
 
     # Display purchased credits
     for bucket in purchased_credits:
-        _display_purchased_credit_line(bucket)
+        _display_bucket_credit_line(bucket, "Purchased")
+
+    # Display promo credits
+    for bucket in promo_credits:
+        _display_bucket_credit_line(bucket, "Promo")
 
     # Display status messages and management link
-    _display_status_message(plan_credits, purchased_credits)
+    _display_status_message(plan_credits, purchased_credits, promo_credits)
     console.print("\nTo manage your plan navigate to https://platform.codeplain.ai/plans")

{codeplain-0.3.2.dist-info → codeplain-0.3.3.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.3.2
+Version: 0.3.3
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Code Generators
-Requires-Python: >=3.11
+Requires-Python: ==3.11
 Requires-Dist: gitpython==3.1.50
 Requires-Dist: mistletoe==1.3.0
 Requires-Dist: networkx==3.6.1
@@ -16,6 +16,7 @@ Requires-Dist: python-liquid2==0.3.0
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: requests==2.34.0
 Requires-Dist: rich==15.0.0
+Requires-Dist: sentry-sdk==2.62.0
 Requires-Dist: textual>=7.5.0
 Requires-Dist: tiktoken==0.12.0
 Requires-Dist: transitions==0.9.3
@@ -103,6 +104,11 @@ After completing the installation steps above, you can immediately test the syst
   python hello_world.py
   ```
 
+### Crash reporting
+
+If the plain2code client crashes unexpectedly, it sends an anonymous crash report to Codeplain to help improve the tool. To disable crash reporting, set the `CODEPLAIN_NO_TELEMETRY=1` flag.
+
+
 ## Releasing
 
 Releases are built and published with [uv](https://docs.astral.sh/uv/). The version is read from `_version.py`.

{codeplain-0.3.2.dist-info → codeplain-0.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_version.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
+_version.py,sha256=8KcCYTXH99C2-gCLuPILJvtT9YftRWJsartIx6TQ2ZY,22
 codeplain_REST_api.py,sha256=h_XoNws8fvf7OTtoVXhHh6OfLGg77UNFuggMBwaqBwE,21533
 concept_utils.py,sha256=D4qVHFBRvfJZwiIq1AD_SV0Ev-RnOMg2yGWo6Cal7PM,7913
 diff_utils.py,sha256=AjiQlqo5pRos_8hVXZo5yBurl5BzSrTMGrQv4dCtRCg,1198
@@ -8,7 +8,7 @@ git_utils.py,sha256=LQQnL5DAFpH5fDBQgUZX2WfjWY4YC5OEGBPIXryTmnY,16896
 memory_management.py,sha256=nHNudgaOqp5UGkIMi62TRCc2nUeFOM0w-I1FfxBFaQE,6120
 module_renderer.py,sha256=pXMXKKGMhUwLLlSxppE_hpZlwpJ3WSHSfR9FQxt6rSI,6860
 partial_rendering.py,sha256=prWEJo9m1TbF7SKzpNInbcefyTF0o3oXE7Qf1l4SmBs,8409
-plain2code.py,sha256=gyPeZtLe7VkGChWwGVNNZRXvkqpH8uC27szHbrZgmeY,14010
+plain2code.py,sha256=Yi6W9R3HNedbaeIgfFffQnfauwTXmJTi8ZRD0LdmfvA,14042
 plain2code_arguments.py,sha256=J05NwaY-O04rIWVF2yIXysNB_ofZS0wJFn0u1WaCCSA,15399
 plain2code_console.py,sha256=YdE-Kz9qRAzIIAg7aYA1bnXRcwy_aTpbFtkR2zHbd-I,4918
 plain2code_events.py,sha256=AM8KJS68uiVXRMLt861KaGhs2H4yzujlMB_xiYPfHQc,1478
@@ -16,7 +16,8 @@ plain2code_exceptions.py,sha256=Fj1pwCffn06aivEplsTJJGdg6lAOR8gmWd4ctLl9cj4,1745
 plain2code_logger.py,sha256=kNKIfkS6Ydtut7Ptw5jmv5bFPgXlxB-_Ds5nd-j4d9o,4609
 plain2code_nodes.py,sha256=IwjQqJxRSJKgP6eEnkYGy3VQHIyoazgkFxAEkxkjfJ8,4426
 plain2code_read_config.py,sha256=D5CxnmTRjddupecWvstcUm0kIJWWzq5-Zmk6sU0wbIg,2235
-plain2code_state.py,sha256=gmqbGfM2dx6ieiqRQRlLPD49JsMAyb3lOWspljcTj9g,1944
+plain2code_state.py,sha256=gIHOmJe9Ml_Xifi6uV5VBMK3zXRpaRoqQNoMhjD1dvQ,2187
+plain2code_telemetry.py,sha256=ZtBgdpWmPZQ_SnC0O9A2XSG30kRJ9kWitQPN4mmT2S8,4245
 plain2code_utils.py,sha256=HYDJ4lTC3RwBgcJadPvcoU3-Y6krNiuDP4_t2xYKA2Q,874
 plain_file.py,sha256=vJKCkIA12o7LHAGugIsTbzcpoQrTQX2uqlXEC_EqfPo,29470
 plain_modules.py,sha256=NXUtxW8fEpJAuEIeVE_iwRBCbHFh2ji-p9xdkgojLqU,14423
@@ -25,21 +26,21 @@ system_config.py,sha256=trgytfXKXoCn0Pgy9u00x2D0ZRHlh_tADlbkwZnF8QE,1038
 cli_output/__init__.py,sha256=MBKl0YbVpWE-tBa3V5_aVbB7vbaqlIK2NsHTjRUZqis,284
 cli_output/dry_run.py,sha256=6NKhNWPtD0CBK_QHSsSqIKLTzibTwxS9d8ltP9d1bgU,1473
 cli_output/render_summary.py,sha256=QrW3Iq15xUoWXuVXpqClAKncAvHdQR0lWG1_OMUBsWk,1307
-cli_output/status.py,sha256=5jr9XFU1MWD3pN404qw7SNYCGdvqfA9j4xv9z1tZG4s,5890
+cli_output/status.py,sha256=PFhHqFaC0nt2zsPR0VbD-JBPB3sEVPfhopJmOylFxbU,6160
 config/__init__.py,sha256=beYSsJWmBNHDP5rYmVDouqgEeP3t1lkkepbXJ-oq0F8,37
 config/system_config.yaml,sha256=of5R9vukSohU9AlkGJOcAVQA1UJgxYmDy6islU6iFuE,508
 docs/generate_cli.py,sha256=0FHVhICbM8g7ahdInTNih3hNKpty1wbV5rdGECMJj48,656
 examples/example_hello_world_python/harness_tests/hello_world_display/test_hello_world.py,sha256=dwTowrHiVKKbrDv21v8xJC30Q57AXZkQasdGOO5JsBE,470
 render_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-render_machine/code_renderer.py,sha256=bLdoZcWaLGvuR0GygnWY9y9kycGySD-IEWY5DFGcGsg,3781
+render_machine/code_renderer.py,sha256=-vp_ltU7e3ssX9hbS8IY4ETSp-39JAuoJ3ZltKpdt1M,3959
 render_machine/conformance_tests.py,sha256=MeEveEGJTClLGxWw04P4TR6U9kX9Qgz9qtxNrB9a8QI,7085
 render_machine/implementation_code_helpers.py,sha256=LdHNLoKgVtrDaGH2APX8C9vjNjLBUhu2V7OAaJvm4rM,2009
-render_machine/render_context.py,sha256=NHDtJkhQP8tW0iyRH6PR7oSk-PO_pEGMKkX38x52YMc,29128
+render_machine/render_context.py,sha256=5W_PVrlPZMPlWmXlHQtYUiCIFvjNFsjNiJ42z5Hidv8,28447
 render_machine/render_types.py,sha256=cT3D0lmxQ3enIo0jGp3LEGCY2t3X1Q1_tqwcadzSAv0,8761
 render_machine/render_utils.py,sha256=ao0e64VSOGYfb8hwJXIZlbqer5HjNMYJWHlLDoHnJyc,9123
-render_machine/state_machine_config.py,sha256=uqrU9Pu4cAKxu_-e1eiuUQK-tZWxZko0U0Bfvl67v_c,28813
+render_machine/state_machine_config.py,sha256=F-pSrNPF31eYMmJMo0STj85q7rp-4qFyy7kEmJ8iVc4,26944
 render_machine/states.py,sha256=niFXqayyA_rezCrlzo0hYeHAruErcPzQVF-BeIBGnL8,1968
-render_machine/triggers.py,sha256=o1N5c9xC7fsKY6ZaWcWBtALT8i1acSSharAXKAqBu8E,1285
+render_machine/triggers.py,sha256=VekNhHGR-u5JXIboqc_Eyqf73LNH7wezLK7r3WWtodk,1269
 render_machine/actions/analyze_specification_ambiguity.py,sha256=SykZAozGvr1jySxbpKCgt11nMpZhOK0sN-J66M42T5Y,2847
 render_machine/actions/base_action.py,sha256=vVzMp-LanrZyq-jamHyWaQxpRl-pLqtTdtiEzUBhfyE,534
 render_machine/actions/commit_conformance_tests_changes.py,sha256=08yxCPCpf5TlrzLPsEh5SJXVVvnLfwdNKSr7BlzlYxo,2589
@@ -64,7 +65,7 @@ standard_template_library/typescript-react-app-boilerplate.plain,sha256=6LFxhEOz
 standard_template_library/typescript-react-app-template.plain,sha256=DN5wEJcT8ZqQTf0vFKi9Z1isi9cin2UVNOZb3r28d3M,715
 tests/__init__.py,sha256=Wk73Io62J15BtlLVIzxmASDWaaJkQLevS4BLK5LDAQg,16
 tests/conftest.py,sha256=QZcp08htUlJGgmHDlRWFgsWXZ8o8IBWTD5QqJaUMlU8,790
-tests/test_cli_output.py,sha256=YdIQtplncTeMf82E0nWNrGYoYAFI8Man4zneYkWmbxk,14425
+tests/test_cli_output.py,sha256=owDP9pLHdErtPAr1paNKp1o044kuH-HxInHLIBLZQFI,18420
 tests/test_file_utils.py,sha256=-O5zImiFVz9JJ4xi8TbsUwNgPFQoQUOl9Frls4BHCBI,1358
 tests/test_git_utils.py,sha256=h3rWhhs4XVRYqzVzdmj51siF_AYD-GkbZiefK2iGfWo,15614
 tests/test_imports.py,sha256=EWYLUxGunUUdsG9iCiY_tts6T7DIVdhdB_MZlB1LsmU,2081
@@ -75,6 +76,7 @@ tests/test_plainfileparser.py,sha256=7AassxH7AKX4lfW6E_58FYxRe-IzIiA16BMVWPjWqCM
 tests/test_plainspec.py,sha256=JrzjJ4VFYDmWTZDq-8WFyt2oMx76IEuO1CAUPQeGOsw,2404
 tests/test_requires.py,sha256=6tnHYaKudxN-RiQjSFoi9nHe_x0ze3QF-f-j67zAE74,1250
 tests/test_resolve_config_file.py,sha256=b87tDOvyzbsnE-QRWbZ97ou7NuyaAgskv-dbYBum31c,2830
+tests/test_telemetry.py,sha256=04mboTP6iXedSF7E4ZL6MPRYCw__-5qlVerjX1Ve7VI,6627
 tests/e2e/conftest.py,sha256=5Dm67UTOE-M6hMb-mqZvwa6Ek_wmZgsR7fUv9ZEqCwY,4164
 tests/e2e/test_hello_world_python.py,sha256=PQy4elzB7WvpiWLKa6_HFO0K8HA6_6hGLaAqRi0J3OU,1627
 tests/e2e/test_hello_world_python_windows.py,sha256=kJQZIuzj8OEEtgBVxnzFvyQJ_wvP2oBu9L-E9geg8sE,2010
@@ -87,8 +89,8 @@ tui/spinner.py,sha256=Ro6Gd9Przf-whuHqPRY6HwI0T57yJjyNPbhDbigZKZE,2471
 tui/state_handlers.py,sha256=4r_6m5YMcprQtgiTP0De3XFfGAF8VzgaWXHxPweYPbQ,16325
 tui/styles.css,sha256=c13WY1nOgmtkT_FH9Ad2PjXrfi8LYwr6zzD6rBOh9tU,6685
 tui/widget_helpers.py,sha256=mWDPrALsxLOzJg8KD9MXXafJKRiqG-EIp797jbOT77o,5972
-codeplain-0.3.2.dist-info/METADATA,sha256=_m-JTZCg09Ur5aGhureD24GwhQpQravmQnsFxfT37bc,5134
-codeplain-0.3.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-codeplain-0.3.2.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
-codeplain-0.3.2.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
-codeplain-0.3.2.dist-info/RECORD,,
+codeplain-0.3.3.dist-info/METADATA,sha256=v2z452H-9kkFwQDigqMjkWeO-w7L9yf0IWEEam-W_Qg,5381
+codeplain-0.3.3.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+codeplain-0.3.3.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
+codeplain-0.3.3.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
+codeplain-0.3.3.dist-info/RECORD,,

plain2code.py

@@ -49,6 +49,7 @@ from plain2code_logger import (
     get_log_file_path,
 )
 from plain2code_state import RunState
+from plain2code_telemetry import capture_crash, initialize_telemetry
 from system_config import system_config
 from tui.plain2code_tui import Plain2CodeTUI
 from tui.plain_module_render_choice_tui import PlainModuleRenderChoiceTUI
@@ -56,6 +57,27 @@ from tui.plain_module_render_choice_tui import PlainModuleRenderChoiceTUI
 DEFAULT_TEMPLATE_DIRS = importlib.resources.files("standard_template_library")
 RENDER_THREAD_SHUTDOWN_TIMEOUT = 0.7
 
+# Exceptions that represent expected, user-facing error conditions. They are
+# reported to the user directly and must never be sent to Sentry as crashes.
+EXPECTED_EXCEPTIONS = (
+    InvalidFridArgument,
+    FileNotFoundError,
+    MissingResource,
+    TemplateNotFoundError,
+    PlainSyntaxError,
+    MissingPreviousFunctionalitiesError,
+    MissingAPIKey,
+    InvalidAPIKey,
+    OutdatedClientVersion,
+    ConflictingRequirements,
+    RenderingCreditBalanceTooLow,
+    NetworkConnectionError,
+    ModuleDoesNotExistError,
+    UnsupportedResourceType,
+    GitNotInstalledError,
+    SystemExit,
+)
+
 
 def setup_logging(
     args,
@@ -324,6 +346,8 @@ def main():  # noqa: C901
         args, event_bus, run_state, args.log_to_file, args.log_file_name, args.filename, args.headless
     )
 
+    initialize_telemetry()
+
     exc_info = None
     error_message = None
 
@@ -340,36 +364,17 @@ def main():  # noqa: C901
         else:
             error_message = str(e) if str(e) else repr(e)
 
-            if not isinstance(
-                e,
-                (
-                    InvalidFridArgument,
-                    FileNotFoundError,
-                    MissingResource,
-                    TemplateNotFoundError,
-                    PlainSyntaxError,
-                    MissingPreviousFunctionalitiesError,
-                    MissingAPIKey,
-                    InvalidAPIKey,
-                    OutdatedClientVersion,
-                    ConflictingRequirements,
-                    RenderingCreditBalanceTooLow,
-                    NetworkConnectionError,
-                    ModuleDoesNotExistError,
-                    UnsupportedResourceType,
-                    GitNotInstalledError,
-                ),
-            ):
+            if not isinstance(e, EXPECTED_EXCEPTIONS):
                 exc_info = sys.exc_info()
     finally:
+        if exc_info:
+            dump_crash_logs(args, run_state)
+            capture_crash(exc_info, run_state, args)
         print_exit_summary(
             run_state,
             args.filename,
             error_message=error_message,
         )
-        if exc_info:
-            # Log traceback
-            dump_crash_logs(args, run_state)
 
     if args.headless and (exc_info is not None or not run_state.render_succeeded):
         sys.exit(1)

plain2code_state.py

@@ -23,6 +23,10 @@ class RunState:
         self.unittest_batch_id: int = 0
         self.render_time_accumulated: int = 0
         self.last_render_start_timestamp: float = time.monotonic()
+        # Mirrored from the render state machine for crash reporting; not authoritative.
+        self.current_module: Optional[str] = None
+        self.current_frid: Optional[str] = None
+        self.current_render_state: Optional[str] = None
 
     def increment_call_count(self):
         self.call_count += 1

plain2code_telemetry.py

@@ -0,0 +1,114 @@
+"""Crash reporting via Sentry.
+
+Only unexpected exceptions are reported (the caller decides which exceptions are
+expected; see EXPECTED_EXCEPTIONS in plain2code.py). Reporting is on by default
+and can be disabled by setting the CODEPLAIN_NO_TELEMETRY environment variable
+to any non-empty value.
+"""
+
+import os
+from typing import Any, Optional
+
+import sentry_sdk
+from sentry_sdk.integrations.atexit import AtexitIntegration
+from sentry_sdk.integrations.dedupe import DedupeIntegration
+from sentry_sdk.integrations.modules import ModulesIntegration
+from sentry_sdk.scrubber import DEFAULT_DENYLIST, EventScrubber
+
+from plain2code_state import RunState
+from system_config import system_config
+
+SENTRY_DSN = "https://64d0d86b50b34e2dede3e4eaf5142282@o4510793955934208.ingest.us.sentry.io/4511540621213696"
+
+NO_TELEMETRY_ENV_VAR = "CODEPLAIN_NO_TELEMETRY"
+ENVIRONMENT_ENV_VAR = "CODEPLAIN_ENV"
+DEFAULT_ENVIRONMENT = "production"
+
+FLUSH_TIMEOUT_SECONDS = 2
+
+# Local variable names whose values may contain proprietary spec or generated
+# code content and must be scrubbed from stack traces (extends Sentry's
+# default denylist, which already covers api_key, auth, secrets etc.).
+# "headers" and "x-api-key" cover the request headers local in
+# codeplain_REST_api.post_request; the default denylist only has the
+# underscore form "x_api_key".
+SCRUB_DENYLIST = DEFAULT_DENYLIST + [
+    "authorization",
+    "headers",
+    "x-api-key",
+    "plain_source",
+    "plain_source_tree",
+    "full_plain_source",
+    "existing_files_content",
+    "file_content",
+    "files_content",
+    "content",
+    "source",
+    "response_json",
+    "payload",
+]
+
+
+def telemetry_enabled() -> bool:
+    """Return True if crash reporting should be active."""
+    if os.environ.get(NO_TELEMETRY_ENV_VAR):
+        return False
+    return True
+
+
+def initialize_telemetry(**init_overrides: Any) -> bool:
+    """Initialize Sentry crash reporting. Returns True if initialized."""
+    if not telemetry_enabled():
+        return False
+
+    try:
+        init_kwargs: dict[str, Any] = dict(
+            dsn=SENTRY_DSN,
+            release=system_config.client_version,
+            environment=os.environ.get(ENVIRONMENT_ENV_VAR, DEFAULT_ENVIRONMENT),
+            send_default_pii=False,
+            server_name="",  # hostname is identifying; don't send it
+            default_integrations=False,
+            auto_enabling_integrations=False,
+            integrations=[
+                AtexitIntegration(callback=lambda pending, timeout: None),
+                DedupeIntegration(),
+                ModulesIntegration(),
+            ],
+            include_local_variables=True,
+            event_scrubber=EventScrubber(denylist=SCRUB_DENYLIST, recursive=True),
+            shutdown_timeout=FLUSH_TIMEOUT_SECONDS,
+        )
+        init_kwargs.update(init_overrides)
+        sentry_sdk.init(**init_kwargs)
+        return True
+    except Exception:
+        return False
+
+
+def capture_crash(exc_info, run_state: Optional[RunState], args) -> bool:
+    """Report an unexpected crash to Sentry. Returns True if an event was sent."""
+    if not telemetry_enabled():
+        return False
+
+    try:
+        with sentry_sdk.new_scope() as scope:
+            if run_state is not None:
+                scope.set_tag("render_id", run_state.render_id)
+                scope.set_tag("render_state", run_state.current_render_state)
+                scope.set_tag("current_module", run_state.current_module)
+                scope.set_tag("current_frid", run_state.current_frid)
+            scope.set_tag("headless", bool(getattr(args, "headless", False)))
+            scope.set_tag("unittests_script_provided", bool(getattr(args, "unittests_script", None)))
+            scope.set_tag("conformance_tests_script_provided", bool(getattr(args, "conformance_tests_script", None)))
+            scope.set_tag(
+                "prepare_environment_script_provided", bool(getattr(args, "prepare_environment_script", None))
+            )
+
+            event_id = sentry_sdk.capture_exception(exc_info[1])
+
+        sentry_sdk.flush(timeout=FLUSH_TIMEOUT_SECONDS)
+        return event_id is not None
+    except Exception:
+        # Telemetry must never break the CLI or mask the original crash.
+        return False

render_machine/code_renderer.py

@@ -42,6 +42,7 @@ class CodeRenderer:
     def run(self):
         """Execute the main rendering workflow."""
         self.render_context.event_bus.publish(RenderModuleStarted(module_name=self.render_context.module_name))
+        self.render_context.run_state.current_module = self.render_context.module_name
         previous_action_payload = None
         previous_state = None
 
@@ -63,6 +64,7 @@ class CodeRenderer:
                 )
             )
             previous_state = deepcopy(self.render_context.state)
+            self.render_context.run_state.current_render_state = self.render_context.state
             self.render_context.script_execution_history.should_update_script_outputs = False
 
             self.render_context.previous_action_payload = previous_action_payload

render_machine/render_context.py

@@ -1,6 +1,6 @@
 import threading
 from copy import deepcopy
-from typing import Optional
+from typing import Callable, Optional
 
 import file_utils
 import git_utils
@@ -162,6 +162,7 @@ class RenderContext:
             linked_resources=linked_resources,
             functional_requirement_render_attempts=0,
         )
+        self.run_state.current_frid = frid
         return
 
     def check_frid_iteration_limit(self):
@@ -195,19 +196,10 @@ class RenderContext:
     def should_run_conformance_tests(self) -> bool:
         return self.conformance_tests_script is not None
 
-    def finish_frid_implementation_step(self):
-        pass
-
     def start_unittests_processing(self):
         self.unit_tests_running_context = UnitTestsRunningContext(fix_attempts=0)
         self.run_state.increment_unittest_batch_id()
 
-    def start_unittests_processing_in_implementation(self):
-        self.start_unittests_processing()
-
-    def start_unittests_processing_in_refactoring(self):
-        self.start_unittests_processing()
-
     def _get_first_frid_conformance_test_running_context(self, module: PlainModule | None):
         conformance_tests_running_context = self.conformance_tests_running_context
 
@@ -280,9 +272,6 @@ class RenderContext:
 
         return conformance_tests_running_context
 
-    def start_unittests_processing_in_conformance_tests(self):
-        self.start_unittests_processing()
-
     def finish_unittests_processing(self):
         existing_files = file_utils.list_all_text_files(self.build_folder)
 
@@ -294,39 +283,32 @@ class RenderContext:
                 self.frid_context.changed_files.add(file_name)
         self.unit_tests_running_context.fix_attempts = 1
 
-    def finish_unittests_processing_during_implementation(self):
-        self.finish_unittests_processing()
-
-    def start_fixing_unit_tests(self):
+    def start_fixing_unit_tests(self, on_limit_exceeded: Callable):
         self.unit_tests_running_context.fix_attempts += 1
-
         if self.unit_tests_running_context.fix_attempts > MAX_UNITTEST_FIX_ATTEMPTS:
-            self.machine.dispatch(triggers.RESTART_FRID_PROCESSING)
+            on_limit_exceeded()
 
-    def start_fixing_unit_tests_in_conformance_tests(self):
-        self.unit_tests_running_context.fix_attempts += 1
+    def _on_unit_test_limit_exceeded_in_implementation(self):
+        self.machine.dispatch(triggers.RESTART_FRID_PROCESSING)
 
-        if self.unit_tests_running_context.fix_attempts > MAX_UNITTEST_FIX_ATTEMPTS:
-            self.functional_requirements_render_attempts_failed_unit_during_conformance_tests += 1
-            if (
-                self.functional_requirements_render_attempts_failed_unit_during_conformance_tests
-                >= MAX_FUNCTIONAL_REQUIREMENT_RENDER_ATTEMPTS_FAILED_UNIT_DURING_CONFORMANCE_TESTS
-            ):
-                error_msg = f"Failed to adjust unit tests after implementation code was update while fixing conformance tests for functionality {self.frid_context.frid} for the {MAX_FUNCTIONAL_REQUIREMENT_RENDER_ATTEMPTS_FAILED_UNIT_DURING_CONFORMANCE_TESTS} times."
-                self.dispatch_error(error_msg)
-            else:
-                console.info(
-                    f"Failed to adjust unit tests after implementation code was update while fixing conformance tests for functionality {self.frid_context.frid}."
-                )
-                console.info(f"Restarting rendering the functionality {self.frid_context.frid} from scratch.")
-                self.machine.dispatch(triggers.RESTART_FRID_PROCESSING)
-
-    def start_fixing_unit_tests_in_refactoring(self):
-        self.unit_tests_running_context.fix_attempts += 1
+    def _on_unit_test_limit_exceeded_in_conformance_tests(self):
+        self.functional_requirements_render_attempts_failed_unit_during_conformance_tests += 1
+        if (
+            self.functional_requirements_render_attempts_failed_unit_during_conformance_tests
+            >= MAX_FUNCTIONAL_REQUIREMENT_RENDER_ATTEMPTS_FAILED_UNIT_DURING_CONFORMANCE_TESTS
+        ):
+            error_msg = f"Failed to adjust the unit tests after implementation code was update while fixing the conformance tests for functionality {self.frid_context.frid} for the {MAX_FUNCTIONAL_REQUIREMENT_RENDER_ATTEMPTS_FAILED_UNIT_DURING_CONFORMANCE_TESTS} times."
+            self.dispatch_error(error_msg)
+        else:
+            console.info(
+                f"Failed to adjust the unit tests after implementation code was updated while fixing the conformance tests for functionality {self.frid_context.frid}."
+            )
+            console.info(f"Restarting rendering the functionality {self.frid_context.frid} from scratch.")
+            self.machine.dispatch(triggers.RESTART_FRID_PROCESSING)
 
-        if self.unit_tests_running_context.fix_attempts > MAX_UNITTEST_FIX_ATTEMPTS:
-            git_utils.revert_changes(self.build_folder)
-            self.machine.dispatch(triggers.START_NEW_REFACTORING_ITERATION)
+    def _on_unit_test_limit_exceeded_in_refactoring(self):
+        git_utils.revert_changes(self.build_folder)
+        self.machine.dispatch(triggers.START_NEW_REFACTORING_ITERATION)
 
     def start_refactoring_code(self):
 
@@ -341,9 +323,6 @@ class RenderContext:
             )
             self.machine.dispatch(triggers.PROCEED_FRID_PROCESSING)
 
-    def finish_refactoring_code(self):
-        pass
-
     def start_testing_environment_preparation(self):
         if (
             self.prepare_environment_script is None

render_machine/state_machine_config.py

@@ -5,7 +5,6 @@ This module defines the hierarchical state machine structure, transitions, and a
 used by the CodeRenderer to orchestrate the code generation workflow.
 """
 
-from dataclasses import dataclass
 from typing import Any, Callable, Dict, List
 
 import git_utils
@@ -30,46 +29,6 @@ from render_machine.render_context import RenderContext
 from render_machine.states import States
 
 
-@dataclass
-class UnitTestsStateConfig:
-    """Dataclass for unit test state configuration."""
-
-    unit_tests_failed_on_enter_function: Callable
-    on_enter_action: Callable
-    on_exit_action: Callable
-
-
-class UnitTestsConfig:
-    """Provides configurations for different unit test scenarios."""
-
-    @staticmethod
-    def for_refactoring(render_context: RenderContext) -> UnitTestsStateConfig:
-        """Configuration for unit tests during refactoring."""
-        return UnitTestsStateConfig(
-            unit_tests_failed_on_enter_function=render_context.start_fixing_unit_tests_in_refactoring,
-            on_enter_action=render_context.start_unittests_processing_in_refactoring,
-            on_exit_action=render_context.finish_unittests_processing,
-        )
-
-    @staticmethod
-    def for_conformance_tests(render_context: RenderContext) -> UnitTestsStateConfig:
-        """Configuration for unit tests during conformance tests."""
-        return UnitTestsStateConfig(
-            unit_tests_failed_on_enter_function=render_context.start_fixing_unit_tests_in_conformance_tests,
-            on_enter_action=render_context.start_unittests_processing_in_conformance_tests,
-            on_exit_action=render_context.finish_unittests_processing,
-        )
-
-    @staticmethod
-    def for_implementation(render_context: RenderContext) -> UnitTestsStateConfig:
-        """Configuration for unit tests during initial implementation."""
-        return UnitTestsStateConfig(
-            unit_tests_failed_on_enter_function=render_context.start_fixing_unit_tests,
-            on_enter_action=render_context.start_unittests_processing_in_implementation,
-            on_exit_action=render_context.finish_unittests_processing_during_implementation,
-        )
-
-
 class StateMachineConfig:
     """Configuration class for the render state machine."""
 
@@ -137,26 +96,21 @@ class StateMachineConfig:
             AnalyzeSpecificationAmbiguity.SUCCESSFUL_OUTCOME: triggers.PROCEED_FRID_PROCESSING,
         }
 
-    def get_processing_unit_tests_states(self, config: UnitTestsStateConfig) -> Dict[str, Any]:
-        """Create the processing unit tests state configuration based on the provided configuration.
-
-        Args:
-            config: A dataclass containing the configuration for the unit test state.
-
-        Returns:
-            Dictionary defining the processing unit tests hierarchical state.
-        """
-        children = [
-            States.UNIT_TESTS_READY.value,
-            {"name": States.UNIT_TESTS_FAILED.value, "on_enter": config.unit_tests_failed_on_enter_function},
-        ]
-
+    def get_processing_unit_tests_states(
+        self, render_context: RenderContext, on_limit_exceeded: Callable
+    ) -> Dict[str, Any]:
         return {
             "name": States.PROCESSING_UNIT_TESTS.value,
             "initial": States.UNIT_TESTS_READY.value,
-            "on_enter": config.on_enter_action,
-            "on_exit": config.on_exit_action,
-            "children": children,
+            "on_enter": render_context.start_unittests_processing,
+            "on_exit": render_context.finish_unittests_processing,
+            "children": [
+                States.UNIT_TESTS_READY.value,
+                {
+                    "name": States.UNIT_TESTS_FAILED.value,
+                    "on_enter": lambda: render_context.start_fixing_unit_tests(on_limit_exceeded),
+                },
+            ],
         }
 
     def get_postprocessing_conformance_tests_states(self) -> Dict[str, Any]:
@@ -191,7 +145,9 @@ class StateMachineConfig:
                     "on_enter": render_context.start_fixing_conformance_tests,
                     "on_exit": render_context.finish_fixing_conformance_tests,
                 },
-                self.get_processing_unit_tests_states(UnitTestsConfig.for_conformance_tests(render_context)),
+                self.get_processing_unit_tests_states(
+                    render_context, render_context._on_unit_test_limit_exceeded_in_conformance_tests
+                ),
                 self.get_postprocessing_conformance_tests_states(),
             ],
         }
@@ -209,10 +165,11 @@ class StateMachineConfig:
             "name": States.REFACTORING_CODE.value,
             "initial": States.READY_FOR_REFACTORING.value,
             "on_enter": render_context.start_refactoring_code,
-            "on_exit": render_context.finish_refactoring_code,
             "children": [
                 States.READY_FOR_REFACTORING.value,
-                self.get_processing_unit_tests_states(UnitTestsConfig.for_refactoring(render_context)),
+                self.get_processing_unit_tests_states(
+                    render_context, render_context._on_unit_test_limit_exceeded_in_refactoring
+                ),
                 States.STEP_COMPLETED.value,
             ],
         }
@@ -225,12 +182,14 @@ class StateMachineConfig:
                 "on_enter": render_context.start_implementing_frid,
                 "on_exit": render_context.finish_implementing_frid,
                 "children": [
-                    {"name": States.STEP_COMPLETED.value, "on_exit": render_context.finish_frid_implementation_step},
+                    {"name": States.STEP_COMPLETED.value},
                     {
                         "name": States.READY_FOR_FRID_IMPLEMENTATION.value,
                         "on_enter": render_context.check_frid_iteration_limit,
                     },
-                    self.get_processing_unit_tests_states(UnitTestsConfig.for_implementation(render_context)),
+                    self.get_processing_unit_tests_states(
+                        render_context, render_context._on_unit_test_limit_exceeded_in_implementation
+                    ),
                     refactoring_code_states,
                     self.get_processing_conformance_tests_states(render_context),
                     States.FRID_FULLY_IMPLEMENTED.value,

render_machine/triggers.py

@@ -7,7 +7,7 @@ that controls the code rendering process.
 
 # Trigger constants for state machine transitions
 START_RENDER = "start_render"
-RENDER_FUNCTIONAL_REQUIREMENT = "render_functional_requirement"  # todo: rename
+RENDER_FUNCTIONAL_REQUIREMENT = "render_functional_requirement"
 PROCEED_FRID_PROCESSING = "proceed_frid_processing"
 MARK_UNIT_TESTS_FAILED = "mark_unit_tests_failed"
 MARK_UNIT_TESTS_PASSED = "mark_unit_tests_passed"

tests/test_cli_output.py

@@ -4,8 +4,8 @@ from unittest.mock import Mock, patch
 
 from cli_output.status import (
     _create_progress_bar,
+    _display_bucket_credit_line,
     _display_credit_line,
-    _display_purchased_credit_line,
     _display_status_message,
     print_status,
 )
@@ -132,8 +132,8 @@ class TestDisplayCreditLine:
         mock_console.print.assert_called_once()
 
 
-class TestDisplayPurchasedCreditLine:
-    """Tests for _display_purchased_credit_line function."""
+class TestDisplayBucketCreditLine:
+    """Tests for _display_bucket_credit_line function."""
 
     @patch("cli_output.status.console")
     def test_display_active_purchased_credits(self, mock_console):
@@ -143,13 +143,28 @@ class TestDisplayPurchasedCreditLine:
             "remaining": 20,
             "expiry_date": "2028-12-12T00:00:00+00:00",
         }
-        _display_purchased_credit_line(bucket)
+        _display_bucket_credit_line(bucket, "Purchased")
 
         call_args = mock_console.print.call_args[0][0]
         assert "Purchased" in call_args
         assert "20 of 100 remaining" in call_args
         assert "expires Dec 12, 2028" in call_args
 
+    @patch("cli_output.status.console")
+    def test_display_active_promo_credits(self, mock_console):
+        """Test displaying active promo credits."""
+        bucket = {
+            "total": 100,
+            "remaining": 20,
+            "expiry_date": "2028-12-12T00:00:00+00:00",
+        }
+        _display_bucket_credit_line(bucket, "Promo")
+
+        call_args = mock_console.print.call_args[0][0]
+        assert "Promo" in call_args
+        assert "20 of 100 remaining" in call_args
+        assert "expires Dec 12, 2028" in call_args
+
     @patch("cli_output.status.console")
     def test_display_expired_purchased_credits(self, mock_console):
         """Test displaying expired purchased credits."""
@@ -158,7 +173,7 @@ class TestDisplayPurchasedCreditLine:
             "remaining": 20,
             "expiry_date": "2024-01-01T00:00:00+00:00",
         }
-        _display_purchased_credit_line(bucket)
+        _display_bucket_credit_line(bucket, "Purchased")
 
         call_args = mock_console.print.call_args[0][0]
         assert "expired Jan 1, 2024" in call_args
@@ -173,7 +188,7 @@ class TestDisplayPurchasedCreditLine:
             "expiry_date": "2026-06-12T00:00:00",  # No timezone
         }
         # Should not raise exception
-        _display_purchased_credit_line(bucket)
+        _display_bucket_credit_line(bucket, "Purchased")
         mock_console.print.assert_called_once()
 
 
@@ -187,7 +202,7 @@ class TestDisplayStatusMessage:
             "remaining": 10,
             "period_end": "2028-12-01T00:00:00+00:00",
         }
-        _display_status_message(plan_credits, [])
+        _display_status_message(plan_credits, [], [])
 
         # Should not print warning message
         mock_console.print.assert_not_called()
@@ -198,10 +213,24 @@ class TestDisplayStatusMessage:
         purchased_credits = [
             {
                 "remaining": 20,
-                "expiry_date": "2026-06-12T00:00:00+00:00",
+                "expiry_date": "2030-06-12T00:00:00+00:00",
+            }
+        ]
+        _display_status_message(None, purchased_credits, [])
+
+        # Should not print warning message
+        mock_console.print.assert_not_called()
+
+    @patch("cli_output.status.console")
+    def test_has_active_promo_credits(self, mock_console):
+        """Test when user only has active promo credits."""
+        promo_credits = [
+            {
+                "remaining": 20,
+                "expiry_date": "2030-06-12T00:00:00+00:00",
             }
         ]
-        _display_status_message(None, purchased_credits)
+        _display_status_message(None, [], promo_credits)
 
         # Should not print warning message
         mock_console.print.assert_not_called()
@@ -213,7 +242,7 @@ class TestDisplayStatusMessage:
             "remaining": 0,
             "period_end": "2028-12-01T00:00:00+00:00",
         }
-        _display_status_message(plan_credits, [])
+        _display_status_message(plan_credits, [], [])
 
         mock_console.print.assert_called_once()
         call_args = mock_console.print.call_args[0][0]
@@ -226,7 +255,7 @@ class TestDisplayStatusMessage:
             "remaining": 10,
             "period_end": "2024-01-01T00:00:00+00:00",
         }
-        _display_status_message(plan_credits, [])
+        _display_status_message(plan_credits, [], [])
 
         mock_console.print.assert_called_once()
         call_args = mock_console.print.call_args[0][0]
@@ -234,8 +263,8 @@ class TestDisplayStatusMessage:
 
     @patch("cli_output.status.console")
     def test_null_plan_credits_and_empty_purchased(self, mock_console):
-        """Test when plan_credits is None and purchased_credits is empty."""
-        _display_status_message(None, [])
+        """Test when plan_credits is None and purchased/promo credits are empty."""
+        _display_status_message(None, [], [])
 
         mock_console.print.assert_called_once()
         call_args = mock_console.print.call_args[0][0]
@@ -384,6 +413,83 @@ class TestPrintStatus:
         purchased_calls = [c for c in calls if "Purchased" in c]
         assert len(purchased_calls) == 2
 
+    @patch("cli_output.status.codeplain_api.CodeplainAPI")
+    @patch("cli_output.status.console")
+    def test_promo_credit_buckets(self, mock_console, mock_api_class):
+        """Test status display includes promo credit buckets."""
+        mock_api = Mock()
+        mock_api_class.return_value = mock_api
+        mock_api.connection_check.return_value = {
+            "client_version_valid": True,
+            "min_client_version": "0.3.0",
+        }
+        mock_api.status.return_value = {
+            "user": {
+                "first_name": "John",
+                "last_name": "Doe",
+                "email": "john@example.com",
+            },
+            "api_key_label": "test-key",
+            "organization_owner_email": "owner@example.com",
+            "plan_credits": None,
+            "purchased_credits": [
+                {
+                    "total": 100,
+                    "remaining": 50,
+                    "expiry_date": "2030-06-12T00:00:00+00:00",
+                },
+            ],
+            "promo_credits": [
+                {
+                    "total": 30,
+                    "remaining": 15,
+                    "expiry_date": "2030-12-31T00:00:00+00:00",
+                },
+            ],
+        }
+
+        print_status("fake-key", "http://localhost:5000", "0.3.0")
+
+        calls = [str(call) for call in mock_console.print.call_args_list]
+        promo_calls = [c for c in calls if "Promo" in c]
+        assert len(promo_calls) == 1
+        # Active credits remain, so no "no credits remaining" warning
+        assert not any("No rendering credits remaining" in c for c in calls)
+
+    @patch("cli_output.status.codeplain_api.CodeplainAPI")
+    @patch("cli_output.status.console")
+    def test_missing_promo_credits_key_is_backward_compatible(self, mock_console, mock_api_class):
+        """Test status display when API response omits promo_credits (older API)."""
+        mock_api = Mock()
+        mock_api_class.return_value = mock_api
+        mock_api.connection_check.return_value = {
+            "client_version_valid": True,
+            "min_client_version": "0.3.0",
+        }
+        mock_api.status.return_value = {
+            "user": {
+                "first_name": "John",
+                "last_name": "Doe",
+                "email": "john@example.com",
+            },
+            "api_key_label": "test-key",
+            "organization_owner_email": "owner@example.com",
+            "plan_credits": {
+                "type": "free",
+                "total": 50,
+                "remaining": 10,
+                "period_end": "2030-12-01T00:00:00+00:00",
+            },
+            "purchased_credits": [],
+            # promo_credits intentionally omitted
+        }
+
+        # Should not raise
+        print_status("fake-key", "http://localhost:5000", "0.3.0")
+
+        calls = [str(call) for call in mock_console.print.call_args_list]
+        assert not any("Promo" in c for c in calls)
+
 
 class TestVersionFlag:
     """Tests for --version flag."""

tests/test_telemetry.py

@@ -0,0 +1,204 @@
+import json
+import sys
+from argparse import Namespace
+
+import pytest
+import sentry_sdk
+from sentry_sdk.envelope import Envelope
+from sentry_sdk.transport import Transport
+
+import plain2code_telemetry
+from plain2code_state import RunState
+from plain2code_telemetry import NO_TELEMETRY_ENV_VAR, capture_crash, initialize_telemetry, telemetry_enabled
+
+
+class CaptureTransport(Transport):
+    """Transport that records events instead of sending them over the network."""
+
+    def __init__(self, options=None):
+        super().__init__(options)
+        self.events = []
+
+    def capture_envelope(self, envelope: Envelope):
+        event = envelope.get_event()
+        if event is not None:
+            self.events.append(event)
+
+
+def make_exc_info(exception):
+    try:
+        raise exception
+    except type(exception):
+        return sys.exc_info()
+
+
+def make_args(**overrides):
+    args = Namespace(
+        headless=False,
+        unittests_script="run_unittests.sh",
+        conformance_tests_script=None,
+        prepare_environment_script=None,
+    )
+    for key, value in overrides.items():
+        setattr(args, key, value)
+    return args
+
+
+@pytest.fixture(autouse=True)
+def clean_telemetry_env(monkeypatch):
+    """Ensure tests are not affected by the developer's environment and never send real events."""
+    monkeypatch.delenv(NO_TELEMETRY_ENV_VAR, raising=False)
+    monkeypatch.delenv(plain2code_telemetry.ENVIRONMENT_ENV_VAR, raising=False)
+    yield
+    client = sentry_sdk.get_client()
+    if client.is_active():
+        client.close(timeout=0)
+
+
+@pytest.fixture
+def transport():
+    return CaptureTransport()
+
+
+def init_with_transport(transport):
+    assert initialize_telemetry(transport=transport)
+
+
+def test_no_telemetry_env_var_disables(monkeypatch, transport):
+    monkeypatch.setenv(NO_TELEMETRY_ENV_VAR, "1")
+
+    assert not telemetry_enabled()
+    assert not initialize_telemetry(transport=transport)
+    assert not capture_crash(make_exc_info(KeyError("boom")), None, make_args())
+    assert transport.events == []
+
+
+def test_capture_crash_sends_event_with_tags(transport):
+    init_with_transport(transport)
+
+    run_state = RunState(spec_filename="test.plain")
+    run_state.current_module = "my_module"
+    run_state.current_frid = "2.1"
+    run_state.current_render_state = "IMPLEMENTING_FRID"
+
+    assert capture_crash(make_exc_info(KeyError("boom")), run_state, make_args(headless=True))
+    sentry_sdk.flush(timeout=2)
+
+    assert len(transport.events) == 1
+    tags = transport.events[0]["tags"]
+    assert tags["render_id"] == run_state.render_id
+    assert tags["current_module"] == "my_module"
+    assert tags["current_frid"] == "2.1"
+    assert tags["render_state"] == "IMPLEMENTING_FRID"
+    assert tags["headless"] is True
+    assert tags["unittests_script_provided"] is True
+    assert tags["conformance_tests_script_provided"] is False
+    assert tags["prepare_environment_script_provided"] is False
+
+
+def test_capture_crash_without_run_state(transport):
+    init_with_transport(transport)
+
+    assert capture_crash(make_exc_info(ValueError("boom")), None, make_args())
+    sentry_sdk.flush(timeout=2)
+
+    assert len(transport.events) == 1
+    assert "render_id" not in transport.events[0]["tags"]
+
+
+def test_local_variables_are_scrubbed(transport):
+    init_with_transport(transport)
+
+    def crash_with_sensitive_locals():
+        api_key = "super-secret-key"  # noqa: F841
+        plain_source = "proprietary spec content"  # noqa: F841
+        raise KeyError("boom")
+
+    try:
+        crash_with_sensitive_locals()
+    except KeyError:
+        exc_info = sys.exc_info()
+
+    assert capture_crash(exc_info, None, make_args())
+    sentry_sdk.flush(timeout=2)
+
+    frames = transport.events[0]["exception"]["values"][0]["stacktrace"]["frames"]
+    crash_frame_vars = frames[-1]["vars"]
+    assert crash_frame_vars["api_key"] == "[Filtered]"
+    assert crash_frame_vars["plain_source"] == "[Filtered]"
+
+
+def test_request_headers_local_is_scrubbed(transport):
+    """The `headers` local in codeplain_REST_api.post_request holds the API key
+    (X-API-Key); the whole variable must be filtered from stack traces."""
+    init_with_transport(transport)
+
+    # Built at runtime so the secret never appears in the source-context lines
+    # that Sentry attaches to stack frames.
+    secret = "".join(["super", "-secret-", "key"])
+
+    def crash_with_headers_local():
+        headers = {"X-API-Key": secret, "Content-Type": "application/json"}  # noqa: F841
+        raise KeyError("boom")
+
+    try:
+        crash_with_headers_local()
+    except KeyError:
+        exc_info = sys.exc_info()
+
+    assert capture_crash(exc_info, None, make_args())
+    sentry_sdk.flush(timeout=2)
+
+    frames = transport.events[0]["exception"]["values"][0]["stacktrace"]["frames"]
+    crash_frame_vars = frames[-1]["vars"]
+    assert crash_frame_vars["headers"] == "[Filtered]"
+    assert secret not in json.dumps(transport.events[0], default=str)
+
+
+def test_nested_sensitive_keys_are_scrubbed(transport):
+    """Scrubbing is recursive: sensitive keys nested inside dict locals are
+    filtered even when the variable name itself is innocuous."""
+    init_with_transport(transport)
+
+    secret = "".join(["nested", "-secret-", "key"])
+
+    def crash_with_nested_secret():
+        request_info = {"url": "https://api.codeplain.ai", "x-api-key": secret}  # noqa: F841
+        raise KeyError("boom")
+
+    try:
+        crash_with_nested_secret()
+    except KeyError:
+        exc_info = sys.exc_info()
+
+    assert capture_crash(exc_info, None, make_args())
+    sentry_sdk.flush(timeout=2)
+
+    assert secret not in json.dumps(transport.events[0], default=str)
+
+
+def test_environment_defaults_to_production(transport):
+    init_with_transport(transport)
+    assert sentry_sdk.get_client().options["environment"] == "production"
+
+
+def test_environment_env_var_respected(monkeypatch, transport):
+    monkeypatch.setenv(plain2code_telemetry.ENVIRONMENT_ENV_VAR, "development")
+    init_with_transport(transport)
+    assert sentry_sdk.get_client().options["environment"] == "development"
+
+
+def test_release_is_client_version(transport):
+    from system_config import system_config
+
+    init_with_transport(transport)
+    assert sentry_sdk.get_client().options["release"] == system_config.client_version
+
+
+def test_capture_crash_never_raises(monkeypatch):
+    monkeypatch.setattr(
+        sentry_sdk, "capture_exception", lambda *a, **k: (_ for _ in ()).throw(RuntimeError("sdk broken"))
+    )
+    init_with_transport(CaptureTransport())
+
+    assert capture_crash(make_exc_info(KeyError("boom")), None, make_args()) is False