cycode 3.25.2.dev1__tar.gz → 3.25.2.dev2__tar.gz

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/PKG-INFO

@@ -1,46 +1,45 @@
 Metadata-Version: 2.4
 Name: cycode
-Version: 3.25.2.dev1
+Version: 3.25.2.dev2
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 License-Expression: MIT
 License-File: LICENCE
 Keywords: secret-scan,cycode,devops,token,secret,security,code
 Author: Cycode
 Author-email: support@cycode.com
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: anyio (>=4.0.0,<4.13.0)
+Requires-Dist: anyio (>=4.14.2,<5.0.0)
 Requires-Dist: arrow (>=1.0.0,<1.5.0)
 Requires-Dist: click (>=8.1.0,<8.2.0)
 Requires-Dist: colorama (>=0.4.3,<0.5.0)
 Requires-Dist: gitpython (>=3.1.62,<3.2.0)
-Requires-Dist: marshmallow (>=4.0.1,<4.1.0)
-Requires-Dist: mcp (>=1.28.1,<2.0.0) ; python_version >= "3.10"
+Requires-Dist: marshmallow (>=4.1.2,<5.0.0)
+Requires-Dist: mcp (>=1.28.1,<2.0.0)
 Requires-Dist: patch-ng (==1.19.1)
 Requires-Dist: pathvalidate (>=3.3.1,<4.0.0)
 Requires-Dist: pydantic (>=2.11.5,<3.0.0)
-Requires-Dist: pyjwt (>=2.8.0,<3.0)
-Requires-Dist: pywin32 (>=312,<313) ; python_version >= "3.10" and sys_platform == "win32"
+Requires-Dist: pyjwt (>=2.15.0,<3.0)
+Requires-Dist: pywin32 (>=312,<313) ; sys_platform == "win32"
 Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: requests (>=2.32.4,<3.0)
+Requires-Dist: requests (>=2.33.0,<3.0)
 Requires-Dist: rich (>=15.0.0,<16.0.0)
 Requires-Dist: tenacity (>=9.1.2,<9.2.0)
 Requires-Dist: tomli (>=2.0.0,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tomli-w (>=1.0.0,<2.0.0)
-Requires-Dist: truststore (>=0.10.4,<0.11.0) ; python_version >= "3.10"
+Requires-Dist: truststore (>=0.10.4,<0.11.0)
 Requires-Dist: typer (>=0.15.3,<0.16.0)
-Requires-Dist: urllib3 (>=2.4.0,<3.0.0)
+Requires-Dist: urllib3 (>=2.8.0,<3.0.0)
 Project-URL: Repository, https://github.com/cycodehq/cycode-cli
 Description-Content-Type: text/markdown
 
@@ -120,7 +119,7 @@ This guide walks you through both installation and usage.
 
 # Prerequisites
 
-- The Cycode CLI application requires Python version 3.9 or later. The MCP command is available only for Python 3.10 and above. If you're using an earlier Python version, this command will not be available.
+- The Cycode CLI application requires Python version 3.10 or later.
 - Use the [`cycode auth` command](#using-the-auth-command) to authenticate to Cycode with the CLI
   - Alternatively, you can get a Cycode Client ID and Client Secret Key by following the steps detailed in the [Service Account Token](https://docs.cycode.com/docs/en/service-accounts) and [Personal Access Token](https://docs.cycode.com/v1/docs/managing-personal-access-tokens) pages, which contain details on getting these values.
 
@@ -292,7 +291,7 @@ Perform the following steps to install the pre-commit hook:
 
 ### Installing Pre-Commit Hook
 
-1. Install the pre-commit framework (Python 3.9 or higher must be installed):
+1. Install the pre-commit framework (Python 3.10 or higher must be installed):
 
    ```bash
    pip3 install pre-commit
@@ -441,9 +440,6 @@ The two options combine: with `CYCODE_CLI_ENABLE_TRUSTSTORE=1`, certificates fro
 
 Notes:
 
-- `CYCODE_CLI_ENABLE_TRUSTSTORE` requires Python 3.10 or newer. On Python 3.9 the CLI logs a warning
-  and falls back to the bundled CA bundle; use `REQUESTS_CA_BUNDLE` instead, or upgrade Python. The
-  standalone executables and the Docker image already ship a supported Python.
 - On Windows, the CLI has always fallen back to the system certificate store when neither
   `REQUESTS_CA_BUNDLE` nor `CURL_CA_BUNDLE` is set. That behavior is unchanged.
 - Proxies themselves are configured with the standard `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
@@ -451,9 +447,6 @@ Notes:
 
 # MCP Command \[EXPERIMENT\]
 
-> [!WARNING]
-> The MCP command is available only for Python 3.10 and above. If you're using an earlier Python version, this command will not be available.
-
 The Model Context Protocol (MCP) command allows you to start an MCP server that exposes Cycode's scanning capabilities to AI systems and applications. This enables AI models to interact with Cycode CLI tools via a standardized protocol.
 
 > [!TIP]

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/README.md

@@ -74,7 +74,7 @@ This guide walks you through both installation and usage.
 
 # Prerequisites
 
-- The Cycode CLI application requires Python version 3.9 or later. The MCP command is available only for Python 3.10 and above. If you're using an earlier Python version, this command will not be available.
+- The Cycode CLI application requires Python version 3.10 or later.
 - Use the [`cycode auth` command](#using-the-auth-command) to authenticate to Cycode with the CLI
   - Alternatively, you can get a Cycode Client ID and Client Secret Key by following the steps detailed in the [Service Account Token](https://docs.cycode.com/docs/en/service-accounts) and [Personal Access Token](https://docs.cycode.com/v1/docs/managing-personal-access-tokens) pages, which contain details on getting these values.
 
@@ -246,7 +246,7 @@ Perform the following steps to install the pre-commit hook:
 
 ### Installing Pre-Commit Hook
 
-1. Install the pre-commit framework (Python 3.9 or higher must be installed):
+1. Install the pre-commit framework (Python 3.10 or higher must be installed):
 
    ```bash
    pip3 install pre-commit
@@ -395,9 +395,6 @@ The two options combine: with `CYCODE_CLI_ENABLE_TRUSTSTORE=1`, certificates fro
 
 Notes:
 
-- `CYCODE_CLI_ENABLE_TRUSTSTORE` requires Python 3.10 or newer. On Python 3.9 the CLI logs a warning
-  and falls back to the bundled CA bundle; use `REQUESTS_CA_BUNDLE` instead, or upgrade Python. The
-  standalone executables and the Docker image already ship a supported Python.
 - On Windows, the CLI has always fallen back to the system certificate store when neither
   `REQUESTS_CA_BUNDLE` nor `CURL_CA_BUNDLE` is set. That behavior is unchanged.
 - Proxies themselves are configured with the standard `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
@@ -405,9 +402,6 @@ Notes:
 
 # MCP Command \[EXPERIMENT\]
 
-> [!WARNING]
-> The MCP command is available only for Python 3.10 and above. If you're using an earlier Python version, this command will not be available.
-
 The Model Context Protocol (MCP) command allows you to start an MCP server that exposes Cycode's scanning capabilities to AI systems and applications. This enables AI models to interact with Cycode CLI tools via a standardized protocol.
 
 > [!TIP]

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/__init__.py

@@ -5,4 +5,4 @@ import time as _time
 # end-to-end scan duration from the moment the user actually triggered it.
 _BOOT_WALL: float = _time.time()
 
-__version__ = '3.25.2.dev1'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '3.25.2.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/app.py

@@ -1,7 +1,7 @@
 import importlib
 import logging
 import sys
-from typing import Annotated, Optional
+from typing import Annotated
 
 import click
 import typer
@@ -51,13 +51,12 @@ _SUBAPP_MODULES: dict[str, str] = {
     'auth': 'cycode.cli.apps.auth',
     'configure': 'cycode.cli.apps.configure',
     'ignore': 'cycode.cli.apps.ignore',
+    'mcp': 'cycode.cli.apps.mcp',
     'report': 'cycode.cli.apps.report',
     'import': 'cycode.cli.apps.report_import',
     'scan': 'cycode.cli.apps.scan',
     'status': 'cycode.cli.apps.status',
 }
-if sys.version_info >= (3, 10):
-    _SUBAPP_MODULES['mcp'] = 'cycode.cli.apps.mcp'
 
 # Aliases: alternate spellings that resolve to a primary subcommand key.
 _SUBAPP_ALIASES: dict[str, str] = {
@@ -80,7 +79,7 @@ _ROOT_OPTS_WITH_VALUE = frozenset(
 )
 
 
-def _detect_invocation() -> tuple[Optional[str], Optional[str]]:
+def _detect_invocation() -> tuple[str | None, str | None]:
     """Return (top-level-subapp, second-level-subcommand) parsed from sys.argv.
 
     Both values may be None: when no positional arg matches a known subapp,
@@ -113,7 +112,7 @@ def _detect_invocation() -> tuple[Optional[str], Optional[str]]:
 _INVOKED_SUBAPP, _INVOKED_SUBCOMMAND = _detect_invocation()
 
 
-def _register_subapps(only: Optional[str]) -> None:
+def _register_subapps(only: str | None) -> None:
     if only is not None:
         app.add_typer(importlib.import_module(_SUBAPP_MODULES[only]).app)
         return
@@ -189,32 +188,32 @@ def app_callback(
         OutputTypeOption, typer.Option('--output', '-o', case_sensitive=False, help='Specify the output type.')
     ] = OutputTypeOption.RICH,
     user_agent: Annotated[
-        Optional[str],
+        str | None,
         typer.Option(hidden=True, help='Characteristic JSON object that lets servers identify the application.'),
     ] = None,
     client_secret: Annotated[
-        Optional[str],
+        str | None,
         typer.Option(
             help='Specify a Cycode client secret for this specific scan execution.',
             rich_help_panel=_AUTH_RICH_HELP_PANEL,
         ),
     ] = None,
     client_id: Annotated[
-        Optional[str],
+        str | None,
         typer.Option(
             help='Specify a Cycode client ID for this specific scan execution.',
             rich_help_panel=_AUTH_RICH_HELP_PANEL,
         ),
     ] = None,
     id_token: Annotated[
-        Optional[str],
+        str | None,
         typer.Option(
             help='Specify a Cycode OIDC ID token for this specific scan execution.',
             rich_help_panel=_AUTH_RICH_HELP_PANEL,
         ),
     ] = None,
     _: Annotated[
-        Optional[bool],
+        bool | None,
         typer.Option(
             '--install-completion',
             callback=install_callback,

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/activation_manager.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode import __version__
 from cycode.cli.config import configuration_manager
@@ -13,13 +13,13 @@ logger = get_logger('Activation Manager')
 _CLI_CLIENT_NAME = 'cli'
 
 
-def _get_client_and_version(plugin_app_name: Optional[str], plugin_app_version: Optional[str]) -> tuple[str, str]:
+def _get_client_and_version(plugin_app_name: str | None, plugin_app_version: str | None) -> tuple[str, str]:
     return plugin_app_name or _CLI_CLIENT_NAME, plugin_app_version or __version__
 
 
 def should_report_cli_activation(
-    plugin_app_name: Optional[str] = None,
-    plugin_app_version: Optional[str] = None,
+    plugin_app_name: str | None = None,
+    plugin_app_version: str | None = None,
 ) -> bool:
     client, version = _get_client_and_version(plugin_app_name, plugin_app_version)
     return configuration_manager.get_last_reported_activation_version(client) != version
@@ -27,8 +27,8 @@ def should_report_cli_activation(
 
 def report_cli_activation(
     cycode_client: 'CycodeClientBase',
-    plugin_app_name: Optional[str] = None,
-    plugin_app_version: Optional[str] = None,
+    plugin_app_name: str | None = None,
+    plugin_app_version: str | None = None,
 ) -> None:
     """Report CLI/IDE activation to the backend if the (client, version) pair is new.
 

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/command_utils.py

@@ -2,7 +2,6 @@
 
 import os
 from pathlib import Path
-from typing import Optional
 
 import typer
 from rich.console import Console
@@ -18,7 +17,7 @@ def validate_scope(scope: str, allowed_scopes: tuple[str, ...] = ('user', 'repo'
         raise typer.Exit(1)
 
 
-def resolve_repo_path(scope: str, repo_path: Optional[Path]) -> Optional[Path]:
+def resolve_repo_path(scope: str, repo_path: Path | None) -> Path | None:
     """Default repo_path to cwd for 'repo' scope; leave None for 'user' scope."""
     if scope == 'repo' and repo_path is None:
         return Path(os.getcwd())

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/hooks_manager.py

@@ -8,7 +8,6 @@ agent-agnostic.
 import copy
 import json
 from pathlib import Path
-from typing import Optional
 
 import yaml
 
@@ -47,7 +46,7 @@ def is_cycode_hook_entry(entry: dict) -> bool:
     return False
 
 
-def _strip_cycode_from_entry(entry: dict) -> Optional[dict]:
+def _strip_cycode_from_entry(entry: dict) -> dict | None:
     """Remove Cycode hooks from ``entry`` and return the remainder.
 
     Returns ``None`` when nothing useful remains (Cursor-flat Cycode entry, or
@@ -72,7 +71,7 @@ def _strip_cycode_from_entry(entry: dict) -> Optional[dict]:
     return entry
 
 
-def _load_hooks_file(hooks_path: Path) -> Optional[dict]:
+def _load_hooks_file(hooks_path: Path) -> dict | None:
     if not hooks_path.exists():
         return None
     try:
@@ -102,7 +101,7 @@ def _load_policy_dict(policy_path: Path) -> dict:
     return {**copy.deepcopy(DEFAULT_POLICY), **existing}
 
 
-def create_policy_file(scope: str, repo_path: Optional[Path] = None) -> tuple[bool, str]:
+def create_policy_file(scope: str, repo_path: Path | None = None) -> tuple[bool, str]:
     """Create or update the ai-guardrails.yaml policy file (operational knobs only).
 
     Enforcement mode and sensitive-path globs are platform-managed; those keys are stripped
@@ -125,7 +124,7 @@ def create_policy_file(scope: str, repo_path: Optional[Path] = None) -> tuple[bo
 def install_hooks(
     ide: IDE,
     scope: str = 'user',
-    repo_path: Optional[Path] = None,
+    repo_path: Path | None = None,
 ) -> tuple[bool, str]:
     """Install Cycode AI guardrails hooks for ``ide``."""
     hooks_path = ide.settings_path(scope, repo_path)
@@ -197,7 +196,7 @@ def _persist_uninstall(hooks_path: Path, existing: dict, modified: bool) -> tupl
     return True, f'Cycode hooks removed from: {hooks_path}'
 
 
-def uninstall_hooks(ide: IDE, scope: str = 'user', repo_path: Optional[Path] = None) -> tuple[bool, str]:
+def uninstall_hooks(ide: IDE, scope: str = 'user', repo_path: Path | None = None) -> tuple[bool, str]:
     """Remove Cycode AI guardrails hooks for ``ide``."""
     hooks_path = ide.settings_path(scope, repo_path)
 
@@ -218,7 +217,7 @@ def uninstall_hooks(ide: IDE, scope: str = 'user', repo_path: Optional[Path] = N
     return True, message
 
 
-def get_hooks_status(ide: IDE, scope: str = 'user', repo_path: Optional[Path] = None) -> dict:
+def get_hooks_status(ide: IDE, scope: str = 'user', repo_path: Path | None = None) -> dict:
     """Return installation status of Cycode hooks for ``ide``."""
     hooks_path = ide.settings_path(scope, repo_path)
 

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/ides/_plugin_utils.py

@@ -7,15 +7,16 @@ supplies the two callables that vary (``locate_dir`` + ``read_plugin``).
 """
 
 import json
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 from cycode.logger import get_logger
 
 logger = get_logger('AI Guardrails Plugins')
 
 
-def resolve_cached_plugin_dir(cache_root: Path, marketplace: str, plugin_name: str) -> Optional[Path]:
+def resolve_cached_plugin_dir(cache_root: Path, marketplace: str, plugin_name: str) -> Path | None:
     """Find ``<cache_root>/<marketplace>/<plugin>/<version-or-hash>/``.
 
     Both Claude Code and Codex cache installed plugin content in this layout (the trailing
@@ -31,7 +32,7 @@ def resolve_cached_plugin_dir(cache_root: Path, marketplace: str, plugin_name: s
     return max(candidates, key=lambda d: (d.stat().st_mtime, d.name))
 
 
-def load_plugin_json(path: Path) -> Optional[dict]:
+def load_plugin_json(path: Path) -> dict | None:
     """Load a JSON file inside a plugin directory; None if missing or invalid."""
     if not path.exists():
         return None
@@ -42,7 +43,7 @@ def load_plugin_json(path: Path) -> Optional[dict]:
         return None
 
 
-def build_global_config_files(path: Path, mcp_servers: Optional[dict]) -> list[dict]:
+def build_global_config_files(path: Path, mcp_servers: dict | None) -> list[dict]:
     """Wrap a global (non-plugin) MCP config into the session-context file shape.
 
     Returns ``[{"path": <full path>, "content": <{"mcpServers": ...} JSON>}]`` when
@@ -58,7 +59,7 @@ def build_global_config_files(path: Path, mcp_servers: Optional[dict]) -> list[d
 def walk_enabled_plugins(
     plugin_entries: dict[str, Any],
     is_enabled: Callable[[Any], bool],
-    locate_dir: Callable[[str, str], Optional[Path]],
+    locate_dir: Callable[[str, str], Path | None],
     read_plugin: Callable[[Path], tuple[dict, dict]],
 ) -> dict:
     """Iterate enabled plugins and build their inventory metadata.

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/ides/_skill_utils.py

@@ -11,7 +11,6 @@ the device its MCP inventory as well.
 """
 
 from pathlib import Path
-from typing import Optional
 
 from cycode.logger import get_logger
 
@@ -32,7 +31,7 @@ MAX_SKILL_FILE_BYTES = 256 * 1024
 MAX_SKILLS_PER_ROOT = 200
 
 
-def _read_skill_file(skill_file: Path) -> Optional[dict]:
+def _read_skill_file(skill_file: Path) -> dict | None:
     """Read one ``SKILL.md`` into the session-context file shape, or None if unusable."""
     try:
         size = skill_file.stat().st_size

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/ides/base.py

@@ -18,7 +18,7 @@ from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import ClassVar, Optional
+from typing import ClassVar
 
 from cycode.cli.apps.ai_guardrails.scan.payload import AIHookPayload
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
@@ -44,17 +44,15 @@ class HookDecision:
 
     action: DecisionAction
     event_type: AiHookEventType
-    user_message: Optional[str] = None
-    agent_message: Optional[str] = None
+    user_message: str | None = None
+    agent_message: str | None = None
 
     @classmethod
     def allow(cls, event_type: AiHookEventType) -> 'HookDecision':
         return cls(action=DecisionAction.ALLOW, event_type=event_type)
 
     @classmethod
-    def deny(
-        cls, event_type: AiHookEventType, user_message: str, agent_message: Optional[str] = None
-    ) -> 'HookDecision':
+    def deny(cls, event_type: AiHookEventType, user_message: str, agent_message: str | None = None) -> 'HookDecision':
         return cls(
             action=DecisionAction.DENY,
             event_type=event_type,
@@ -63,7 +61,7 @@ class HookDecision:
         )
 
     @classmethod
-    def ask(cls, event_type: AiHookEventType, user_message: str, agent_message: Optional[str] = None) -> 'HookDecision':
+    def ask(cls, event_type: AiHookEventType, user_message: str, agent_message: str | None = None) -> 'HookDecision':
         return cls(
             action=DecisionAction.ASK,
             event_type=event_type,
@@ -92,7 +90,7 @@ class IDE(ABC):
     # --- install / status ---
 
     @abstractmethod
-    def settings_path(self, scope: str, repo_path: Optional[Path] = None) -> Path:
+    def settings_path(self, scope: str, repo_path: Path | None = None) -> Path:
         """Return the hooks/settings file path for the given scope.
 
         `scope` is 'user' or 'repo'. `repo_path` is required when scope == 'repo'.
@@ -108,7 +106,7 @@ class IDE(ABC):
         ``hooks_manager`` can treat them uniformly.
         """
 
-    def post_install(self, scope: str, repo_path: Optional[Path] = None) -> tuple[bool, str]:
+    def post_install(self, scope: str, repo_path: Path | None = None) -> tuple[bool, str]:
         """Run IDE-specific actions after the hooks file is written.
 
         Default: no-op success. Override to perform extra setup that doesn't
@@ -120,7 +118,7 @@ class IDE(ABC):
         """
         return True, ''
 
-    def post_uninstall(self, scope: str, repo_path: Optional[Path] = None) -> tuple[bool, str]:
+    def post_uninstall(self, scope: str, repo_path: Path | None = None) -> tuple[bool, str]:
         """Run IDE-specific cleanup after the hooks file is removed.
 
         Default: no-op success. Override to undo whatever ``post_install``
@@ -169,7 +167,7 @@ class IDE(ABC):
         """
         return AIHookPayload(ide_provider=self.name)
 
-    def get_user_email(self) -> Optional[str]:
+    def get_user_email(self) -> str | None:
         """Best-effort read of the user's email from IDE-specific config.
 
         Default: None. Override if the IDE stores a usable account locally.

{cycode-3.25.2.dev1 → cycode-3.25.2.dev2}/cycode/cli/apps/ai_guardrails/ides/claude_code.py

@@ -5,7 +5,7 @@ import re
 from collections.abc import Iterator
 from copy import deepcopy
 from pathlib import Path
-from typing import ClassVar, Optional
+from typing import ClassVar
 
 from cycode.cli.apps.ai_guardrails.consts import CYCODE_SCAN_PROMPT_COMMAND, CYCODE_SESSION_START_COMMAND
 from cycode.cli.apps.ai_guardrails.ides._plugin_utils import (
@@ -80,12 +80,12 @@ def _reverse_readline(path: Path, buf_size: int = 8192) -> Iterator[str]:
             yield buffer.decode('utf-8', errors='replace')
 
 
-def _extract_model(entry: dict) -> Optional[str]:
+def _extract_model(entry: dict) -> str | None:
     """Extract model from a transcript entry (top level or nested in message)."""
     return entry.get('model') or (entry.get('message') or {}).get('model')
 
 
-def _extract_generation_id(entry: dict) -> Optional[str]:
+def _extract_generation_id(entry: dict) -> str | None:
     """Extract generation ID from a user-type transcript entry."""
     if entry.get('type') == 'user':
         return entry.get('uuid')
@@ -94,7 +94,7 @@ def _extract_generation_id(entry: dict) -> Optional[str]:
 
 def extract_from_claude_transcript(
     transcript_path: str,
-) -> tuple[Optional[str], Optional[str], Optional[str]]:
+) -> tuple[str | None, str | None, str | None]:
     """Extract ``(ide_version, model, generation_id)`` from a transcript.
 
     The transcript is a JSONL file scanned from end → start so the most recent
@@ -135,7 +135,7 @@ def extract_from_claude_transcript(
 # --- ~/.claude.json + ~/.claude/settings.json parsing -------------------------
 
 
-def load_claude_config(config_path: Optional[Path] = None) -> Optional[dict]:
+def load_claude_config(config_path: Path | None = None) -> dict | None:
     """Load and parse `~/.claude.json`. Returns None if missing/invalid."""
     path = config_path or _CLAUDE_CONFIG_PATH
     if not path.exists():
@@ -148,17 +148,17 @@ def load_claude_config(config_path: Optional[Path] = None) -> Optional[dict]:
         return None
 
 
-def _email_from_config(config: dict) -> Optional[str]:
+def _email_from_config(config: dict) -> str | None:
     """Read ``oauthAccount.emailAddress`` from a parsed Claude config."""
     return config.get('oauthAccount', {}).get('emailAddress')
 
 
-def get_mcp_servers(config: dict) -> Optional[dict]:
+def get_mcp_servers(config: dict) -> dict | None:
     """Read ``mcpServers`` from a parsed Claude config."""
     return config.get('mcpServers')
 
 
-def load_claude_settings(settings_path: Optional[Path] = None) -> Optional[dict]:
+def load_claude_settings(settings_path: Path | None = None) -> dict | None:
     """Load and parse `~/.claude/settings.json`. Returns None if missing/invalid."""
     path = settings_path or _CLAUDE_SETTINGS_PATH
     if not path.exists():
@@ -185,7 +185,7 @@ def _plugins_cache_dir() -> Path:
     return Path.home() / '.claude' / 'plugins' / 'cache'
 
 
-def _resolve_marketplace_path(marketplace: dict) -> Optional[Path]:
+def _resolve_marketplace_path(marketplace: dict) -> Path | None:
     """Resolve filesystem path for a directory-type marketplace."""
     source = marketplace.get('source', {})
     if source.get('source') != 'directory':
@@ -236,7 +236,7 @@ def resolve_plugins(settings: dict) -> dict:
     enabled = settings.get('enabledPlugins') or {}
     marketplaces = settings.get('extraKnownMarketplaces') or {}
 
-    def _locate(plugin_name: str, marketplace_name: str) -> Optional[Path]:
+    def _locate(plugin_name: str, marketplace_name: str) -> 'Path | None':
         # Directory-type marketplaces point straight at the plugin source; every other source
         # type (git, github, ...) is cloned into the local plugin cache.
         marketplace = marketplaces.get(marketplace_name)
@@ -259,7 +259,7 @@ def _sanitize_mcp_name(name: str) -> str:
     return re.sub(r'[^a-z0-9_-]', '_', name.lower())
 
 
-def _local_mcp_servers(config: Optional[dict], cwd: Optional[str]) -> Iterator[tuple[str, str]]:
+def _local_mcp_servers(config: dict | None, cwd: str | None) -> Iterator[tuple[str, str]]:
     """Yield ``(name as Claude Code namespaces it, config key)`` for each locally configured MCP server."""
     sources = []
     if config:
@@ -280,7 +280,7 @@ def _local_mcp_servers(config: Optional[dict], cwd: Optional[str]) -> Iterator[t
             yield f'plugin_{plugin_name}_{server}', server
 
 
-def _resolve_mcp_server_name(server: str, config: Optional[dict], cwd: Optional[str]) -> str:
+def _resolve_mcp_server_name(server: str, config: dict | None, cwd: str | None) -> str:
     """Map the server segment of ``mcp__<server>__<tool>`` back to its config key; unknown names pass through."""
     wanted = _sanitize_mcp_name(server)
     for namespaced, name in _local_mcp_servers(config, cwd):
@@ -297,7 +297,7 @@ class ClaudeCode(IDE):
     display_name: ClassVar[str] = 'Claude Code'
     hook_events: ClassVar[list[str]] = list(_HOOK_EVENTS)
 
-    def settings_path(self, scope: str, repo_path: Optional[Path] = None) -> Path:
+    def settings_path(self, scope: str, repo_path: Path | None = None) -> Path:
         if scope == 'repo' and repo_path:
             return repo_path / _REPO_SUBDIR / _HOOKS_FILE_NAME
         return _USER_HOOKS_DIR / _HOOKS_FILE_NAME
@@ -430,7 +430,7 @@ class ClaudeCode(IDE):
             source=raw_payload.get('source'),
         )
 
-    def get_user_email(self) -> Optional[str]:
+    def get_user_email(self) -> str | None:
         config = load_claude_config()
         return _email_from_config(config) if config else None