Merge pull request #317 from alex-feel/alex-feel-dev

Add effortLevel support to environment configurations

Author: alex-feel

CLAUDE.md

@@ -227,7 +227,7 @@ The golden config includes:
 - Hooks: `hooks` (files and events with command/prompt types)
 - MCP Servers: `mcp-servers` (http, sse, stdio transports)
 - Settings: `model`, `permissions`, `env-variables`, `os-env-variables`
-- Advanced: `command-defaults`, `user-settings`, `always-thinking-enabled`
+- Advanced: `command-defaults`, `user-settings`, `always-thinking-enabled`, `effort-level`
 - Extras: `company-announcements`, `attribution`, `status-line`
 
 #### Key Design Principles

scripts/setup_environment.py

@@ -84,6 +84,7 @@
     'always-thinking-enabled': 'alwaysThinkingEnabled',
     'company-announcements': 'companyAnnouncements',
     'env-variables': 'env',                     # Different names
+    'effort-level': 'effortLevel',              # Adaptive reasoning effort
 }
 
 
@@ -5050,6 +5051,7 @@ def create_additional_settings(
     company_announcements: list[str] | None = None,
     attribution: dict[str, str] | None = None,
     status_line: dict[str, Any] | None = None,
+    effort_level: str | None = None,
 ) -> bool:
     """Create {command_name}-additional-settings.json with environment-specific settings.
 
@@ -5073,6 +5075,9 @@ def create_additional_settings(
             'padding' key, and optional 'config' key for config file reference.
             Both the script and config file are downloaded to ~/.claude/hooks/ and
             the config path is appended as a command line argument.
+        effort_level: Optional effort level for adaptive reasoning.
+            Valid values: 'low', 'medium', 'high'. Controls how much thinking
+            is allocated based on task complexity.
 
     Returns:
         bool: True if successful, False otherwise.
@@ -5130,6 +5135,11 @@ def create_additional_settings(
         settings['alwaysThinkingEnabled'] = always_thinking_enabled
         info(f'Setting alwaysThinkingEnabled: {always_thinking_enabled}')
 
+    # Add effortLevel if explicitly set (None means not configured, leave as default)
+    if effort_level is not None:
+        settings['effortLevel'] = effort_level
+        info(f'Setting effortLevel: {effort_level}')
+
     # Add companyAnnouncements if explicitly set (None means not configured, leave as default)
     if company_announcements is not None:
         settings['companyAnnouncements'] = company_announcements
@@ -6244,6 +6254,17 @@ def main() -> None:
         # Extract status_line configuration
         status_line = config.get('status-line')
 
+        # Extract and validate effort_level configuration
+        effort_level = config.get('effort-level')
+        if effort_level is not None:
+            valid_effort_levels = ('low', 'medium', 'high')
+            if effort_level not in valid_effort_levels:
+                warning(
+                    f'Invalid effort-level value: {effort_level!r}. '
+                    f'Valid values: {", ".join(valid_effort_levels)}. Skipping.',
+                )
+                effort_level = None
+
         # Extract user-settings configuration (global user-level settings)
         user_settings = config.get('user-settings')
 
@@ -6501,6 +6522,7 @@ def main() -> None:
                 company_announcements,
                 attribution,
                 status_line_arg,
+                effort_level,
             )
 
             # Step 15: Create launcher script
@@ -6613,6 +6635,8 @@ def main() -> None:
             print(f'   * Environment variables: {len(env_variables)} configured')
         if company_announcements:
             print(f'   * Company announcements: {len(company_announcements)} configured')
+        if effort_level:
+            print(f'   * Effort level: {effort_level}')
         if status_line and isinstance(status_line, dict):
             status_line_dict = cast(dict[str, Any], status_line)
             status_line_file_val = status_line_dict.get('file', '')

tests/e2e/conftest.py

@@ -161,6 +161,7 @@ def golden_config() -> dict[str, Any]:
     - command-defaults: System prompt and mode
     - user-settings: User settings to merge
     - always-thinking-enabled: Thinking mode flag
+    - effort-level: Adaptive reasoning effort level
     - company-announcements: Announcement messages
     - attribution: Commit and PR attribution settings
     - status-line: Status line configuration

tests/e2e/expected/common.py

@@ -30,6 +30,7 @@
         'companyAnnouncements',
         'attribution',
         'statusLine',
+        'effortLevel',
     ],
     'mcp-config': [
         'mcpServers',

tests/e2e/golden_config.yaml

@@ -176,6 +176,9 @@ user-settings:
 # Always-thinking mode
 always-thinking-enabled: true
 
+# Effort level for adaptive reasoning
+effort-level: "low"
+
 # Company announcements
 company-announcements:
   - "Welcome to E2E Testing Environment"

tests/e2e/test_full_setup.py

@@ -97,6 +97,7 @@ def test_setup_creates_expected_files(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         # Create MCP config file (use configure_all_mcp_servers to get profile servers)
@@ -168,6 +169,7 @@ def test_setup_processes_all_config_keys(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         # Verify additional-settings file exists (written to claude_user_dir)

tests/e2e/test_javascript_hooks.py

@@ -42,6 +42,7 @@ def test_js_hook_has_node_prefix(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -89,6 +90,7 @@ def test_mjs_hook_has_node_prefix(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -131,6 +133,7 @@ def test_cjs_hook_has_node_prefix(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -173,6 +176,7 @@ def test_js_hook_with_config_has_node_prefix(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -227,6 +231,7 @@ def test_python_and_js_hooks_coexist(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -282,6 +287,7 @@ def test_no_cmd_wrapper_for_node(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'

tests/e2e/test_output_files.py

@@ -53,6 +53,7 @@ def test_additional_settings_json_structure(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         # File is written to claude_user_dir (= claude_dir)
@@ -88,6 +89,7 @@ def test_additional_settings_has_expected_keys(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         # File is written to claude_user_dir (= claude_dir)
@@ -211,6 +213,7 @@ def test_permissions_structure_complete(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         # File is written to claude_user_dir (= claude_dir)

tests/e2e/test_path_handling.py

@@ -112,6 +112,7 @@ def test_additional_settings_paths_expanded(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         # File is written to claude_user_dir (= claude_dir)
@@ -237,6 +238,7 @@ def test_hooks_command_paths_expanded(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         # File is written to claude_user_dir (= claude_dir)
@@ -293,6 +295,7 @@ def test_status_line_command_expanded(
             company_announcements=None,
             attribution=None,
             status_line=status_line_config,
+            effort_level=None,
         )
 
         # File is written to claude_user_dir (= claude_dir)

tests/e2e/test_path_normalization.py

@@ -297,6 +297,7 @@ def test_hooks_use_posix_paths(
             company_announcements=None,
             attribution=None,
             status_line=None,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -361,6 +362,7 @@ def test_status_line_uses_posix_paths(
             company_announcements=None,
             attribution=None,
             status_line=status_line_config,
+            effort_level=None,
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'
@@ -411,6 +413,7 @@ def test_additional_settings_all_paths_consistent(
             company_announcements=golden_config.get('company-announcements'),
             attribution=golden_config.get('attribution'),
             status_line=golden_config.get('status-line'),
+            effort_level=golden_config.get('effort-level'),
         )
 
         settings_path = claude_dir / f'{cmd}-additional-settings.json'