crackerjack 0.39.5__py3-none-any.whl → 0.39.6__py3-none-any.whl

crackerjack/mcp/tools/execution_tools.py

@@ -17,37 +17,91 @@ def register_execution_tools(mcp_app: t.Any) -> None:
 def _register_execute_crackerjack_tool(mcp_app: t.Any) -> None:
     @mcp_app.tool()  # type: ignore[misc]
     async def execute_crackerjack(args: str, kwargs: str) -> str:
-        context = get_context()
-
-        validation_error = await _validate_context_and_rate_limit(context)
-        if validation_error:
-            return validation_error
-
-        kwargs_result = _parse_kwargs(kwargs)
-        if "error" in kwargs_result:
-            return json.dumps(kwargs_result)
-
-        extra_kwargs = kwargs_result["kwargs"]
+        try:
+            context = get_context()
+            validation_error = await _handle_context_validation(context)
+            if validation_error:
+                return validation_error
 
-        if "execution_timeout" not in extra_kwargs:
-            if extra_kwargs.get("test", False) or extra_kwargs.get("testing", False):
-                extra_kwargs["execution_timeout"] = 1200
-            else:
-                extra_kwargs["execution_timeout"] = 900
+            kwargs_result = _parse_kwargs(kwargs)
+            if "error" in kwargs_result:
+                return json.dumps(kwargs_result)
 
-        try:
+            extra_kwargs = _prepare_execution_kwargs(kwargs_result["kwargs"])
             result = await execute_crackerjack_workflow(args, extra_kwargs)
             return json.dumps(result, indent=2)
+        except TypeError as e:
+            return _handle_type_error(e)
         except Exception as e:
+            return _handle_general_error(e)
+
+
+async def _handle_context_validation(context: t.Any) -> str | None:
+    """Handle context validation with proper error handling."""
+    from datetime import datetime
+
+    try:
+        validation_error = await _validate_context_and_rate_limit(context)
+        if validation_error:
+            return validation_error
+        return None
+    except TypeError as e:
+        if "NoneType" in str(e) and "await" in str(e):
             return json.dumps(
                 {
                     "status": "failed",
-                    "error": f"Execution failed: {e}",
-                    "timestamp": context.get_current_time()
-                    if hasattr(context, "get_current_time")
-                    else None,
+                    "error": "Context validation failed: rate limiter returned None. "
+                    "MCP server may not be properly initialized.",
+                    "timestamp": datetime.now().isoformat(),
+                    "details": str(e),
                 }
             )
+        raise
+
+
+def _prepare_execution_kwargs(kwargs: dict[str, t.Any]) -> dict[str, t.Any]:
+    """Prepare execution kwargs with appropriate timeout defaults."""
+    if "execution_timeout" not in kwargs:
+        if kwargs.get("test", False) or kwargs.get("testing", False):
+            kwargs["execution_timeout"] = 1200
+        else:
+            kwargs["execution_timeout"] = 900
+    return kwargs
+
+
+def _handle_type_error(error: TypeError) -> str:
+    """Handle TypeError with specific async execution error details."""
+    import traceback
+    from datetime import datetime
+
+    if "NoneType" in str(error) and "await" in str(error):
+        return json.dumps(
+            {
+                "status": "failed",
+                "error": f"Async execution error: A function returned None instead of an awaitable. {error}",
+                "traceback": traceback.format_exc(),
+                "timestamp": datetime.now().isoformat(),
+            }
+        )
+    raise error
+
+
+def _handle_general_error(error: Exception) -> str:
+    """Handle general execution errors with traceback."""
+    import traceback
+    from datetime import datetime
+
+    context = get_context()
+    return json.dumps(
+        {
+            "status": "failed",
+            "error": f"Execution failed: {error}",
+            "traceback": traceback.format_exc(),
+            "timestamp": context.get_current_time()
+            if context and hasattr(context, "get_current_time")
+            else datetime.now().isoformat(),
+        }
+    )
 
 
 def _register_smart_error_analysis_tool(mcp_app: t.Any) -> None:

crackerjack/mcp/tools/workflow_executor.py

@@ -419,43 +419,69 @@ async def _execute_single_iteration(
     context: t.Any,
 ) -> bool:
     try:
-        if hasattr(orchestrator, "run_complete_workflow_async"):
-            result = orchestrator.run_complete_workflow_async(options)
-            if result is None:
-                raise ValueError(
-                    "Method run_complete_workflow_async returned None instead of awaitable"
-                )
-            workflow_result: bool = await result
-            return workflow_result
-        elif hasattr(orchestrator, "run_complete_workflow"):
-            result = orchestrator.run_complete_workflow(options)
-            if result is None:
-                raise ValueError(
-                    "Method run_complete_workflow returned None instead of awaitable"
-                )
-            workflow_result: bool = await result
-            return workflow_result
-        elif hasattr(orchestrator, "execute_workflow"):
-            result = orchestrator.execute_workflow(options)
-            if result is None:
-                raise ValueError(
-                    "Method execute_workflow returned None instead of awaitable"
-                )
-            workflow_result: bool = await result
-            return workflow_result
-        elif hasattr(orchestrator, "run"):
-            run_result: bool = orchestrator.run(options)
-            return run_result
-        else:
-            raise ValueError(
-                f"Orchestrator {type(orchestrator)} has no recognized workflow execution method"
-            )
+        method_name = _detect_orchestrator_method(orchestrator)
+        result = _invoke_orchestrator_method(orchestrator, method_name, options)
+
+        # Sync methods return directly, async methods need await
+        if method_name == "run":
+            return result
+
+        # Async methods - validate and await
+        _validate_awaitable_result(result, method_name, orchestrator)
+        return await result
     except Exception as e:
         raise RuntimeError(
             f"Error in _execute_single_iteration (iteration {iteration}): {e}"
         ) from e
 
 
+def _detect_orchestrator_method(orchestrator: t.Any) -> str:
+    """Detect which workflow method the orchestrator supports."""
+    method_priority = [
+        "run_complete_workflow_async",
+        "run_complete_workflow",
+        "execute_workflow",
+        "run",
+    ]
+
+    for method_name in method_priority:
+        if hasattr(orchestrator, method_name):
+            return method_name
+
+    available_methods = [m for m in dir(orchestrator) if not m.startswith("_")]
+    raise ValueError(
+        f"Orchestrator {type(orchestrator).__name__} has no recognized workflow execution method. "
+        f"Available methods: {available_methods}"
+    )
+
+
+def _invoke_orchestrator_method(
+    orchestrator: t.Any, method_name: str, options: t.Any
+) -> t.Any:
+    """Invoke the detected orchestrator method with options."""
+    method = getattr(orchestrator, method_name)
+    result = method(options)
+
+    if result is None:
+        raise ValueError(
+            f"Method {method_name} returned None instead of expected result. "
+            f"Orchestrator type: {type(orchestrator).__name__}"
+        )
+
+    return result
+
+
+def _validate_awaitable_result(
+    result: t.Any, method_name: str, orchestrator: t.Any
+) -> None:
+    """Validate that async method result is awaitable."""
+    if not hasattr(result, "__await__"):
+        raise ValueError(
+            f"Method {method_name} returned non-awaitable object: {type(result).__name__}. "
+            f"Orchestrator: {type(orchestrator).__name__}"
+        )
+
+
 def _create_success_result(
     job_id: str,
     iterations: int,

{crackerjack-0.39.5.dist-info → crackerjack-0.39.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crackerjack
-Version: 0.39.5
+Version: 0.39.6
 Summary: Crackerjack Python project management tool
 Project-URL: documentation, https://github.com/lesleslie/crackerjack
 Project-URL: homepage, https://github.com/lesleslie/crackerjack
@@ -142,17 +142,17 @@ Crackerjack is built on the following core principles:
 
 ## Table of Contents
 
-- [Installation](#installation)
-- [Quick Start](#quick-start)
-- [AI Auto-Fix Features](#ai-auto-fix-features)
-- [Core Features](#core-features)
-- [MCP Server Configuration](#mcp-server-configuration)
-- [Pre-commit Hook Modes](#pre-commit-hook-modes)
-- [Testing Features](#testing-features)
-- [Command Reference](#command-reference)
-- [Style Guide](#style-guide)
-- [Publishing & Version Management](#publishing--version-management)
-- [Developer Experience](#developer-experience)
+- \[[#installation|Installation]\]
+- \[[#quick-start|Quick Start]\]
+- \[[#ai-auto-fix-features|AI Auto-Fix Features]\]
+- \[[#core-workflow|Core Workflow]\]
+- \[[#core-features|Core Features]\]
+- \[[#mcp-server-configuration|MCP Server Configuration]\]
+- \[[#pre-commit-hook-modes|Pre-commit Hook Modes]\]
+- \[[#command-reference|Command Reference]\]
+- \[[#style-guide|Style Guide]\]
+- \[[#publishing--version-management|Publishing & Version Management]\]
+- \[[#-troubleshooting|Troubleshooting]\]
 
 ## Installation
 

{crackerjack-0.39.5.dist-info → crackerjack-0.39.6.dist-info}/RECORD

@@ -116,7 +116,7 @@ crackerjack/mcp/websocket_server.py,sha256=Dsw_orJOSeO7t7zRiVErh8GLp5jAaGab6shOe
 crackerjack/mcp/tools/__init__.py,sha256=nV3tGXw4M4p8etZGqxKEglEgFZURGtazQvqwzLJ6VRs,696
 crackerjack/mcp/tools/core_tools.py,sha256=8gytjhqxKglR-ZvLIy0DwJzzaqStex_s9WHiAjkXlD0,14612
 crackerjack/mcp/tools/error_analyzer.py,sha256=8ap3_TIqEfrN0n49w_wJFRE3zu7eHB9E8UyXqqz7unM,8515
-crackerjack/mcp/tools/execution_tools.py,sha256=iMtcTm45v04wNgfiIdzOjMXyB-lZ9x-yUtN9SuLGxNI,10410
+crackerjack/mcp/tools/execution_tools.py,sha256=Cow250ChUxM_gu1jOzBfuOM0ILyZ0M5KJwTaNz1EOTg,12288
 crackerjack/mcp/tools/execution_tools_backup.py,sha256=sWOtid00SkuonFLT2XCtljOGZiibbaIXzEdLWsPrXyI,33351
 crackerjack/mcp/tools/intelligence_tool_registry.py,sha256=eAOBzW3EZTKSz_MeYVzgjD6a1xVZFSXUdgOsgcQLSBk,1262
 crackerjack/mcp/tools/intelligence_tools.py,sha256=HRjX6i3wKKniUbffYZFjRP2PdxsTmDwi4D0SAlsyQDs,9124
@@ -125,7 +125,7 @@ crackerjack/mcp/tools/proactive_tools.py,sha256=EKTCNS8285p6f3p3bd3AdEGN6OWMvAWn
 crackerjack/mcp/tools/progress_tools.py,sha256=S4IkENegGaH06EYNotJ3m2Zuky2OMk-iSd3rLs9T9vs,6930
 crackerjack/mcp/tools/semantic_tools.py,sha256=fPH5AAEyttdJibZzmFYTGlUw079ue2gSvTuHC_ihC_g,18512
 crackerjack/mcp/tools/utility_tools.py,sha256=zt4tES5uhyvZfMdgtStlqItWCBA4MWqGCypQ5u_HPds,10367
-crackerjack/mcp/tools/workflow_executor.py,sha256=IvHPyvak1UP1MsWgrYScoFvIe52gL7cdPlec0mAHkFc,19628
+crackerjack/mcp/tools/workflow_executor.py,sha256=ELrWOZ8DYjhciWbi3JtM0SEYecFQmdzKZGbibYMODG0,20128
 crackerjack/mcp/websocket/__init__.py,sha256=lZzyfvYjywHfqyy5X3wWR_jgBkRUxYSpgjdKALBzZcI,345
 crackerjack/mcp/websocket/app.py,sha256=NGZemhdO4TdFBcA8IvRjpRR1_26FTWBGmOsGVyAD2pY,1339
 crackerjack/mcp/websocket/endpoints.py,sha256=SHP6WEm88DMyZvHrc3i3r0o9IDU06Nvce7qPwr43Sv0,16158
@@ -235,8 +235,8 @@ crackerjack/tools/validate_input_validator_patterns.py,sha256=NN7smYlXWrHLQXTb-8
 crackerjack/tools/validate_regex_patterns.py,sha256=J7GG9EP1fASpRIsG8qRPeiCSkdCwmk0sdo29GgoJ6w8,5863
 crackerjack/ui/__init__.py,sha256=eMb1OeTU-dSLICAACn0YdYB4Amdr8wHckjKfn0wOIZE,37
 crackerjack/ui/server_panels.py,sha256=F5IH6SNN06BaZQMsFx_D-OA286aojmaFPJ5kvvSRv_c,4232
-crackerjack-0.39.5.dist-info/METADATA,sha256=-MHXYDHG3BYxrEqgCxIOAbvrVuDE09zfW4j24UNrB44,38239
-crackerjack-0.39.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-crackerjack-0.39.5.dist-info/entry_points.txt,sha256=AJKNft0WXm9xoGUJ3Trl-iXHOWxRAYbagQiza3AILr4,57
-crackerjack-0.39.5.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
-crackerjack-0.39.5.dist-info/RECORD,,
+crackerjack-0.39.6.dist-info/METADATA,sha256=n6eZ4gKgYuzvMYUhUTfXFF-Bk9hdg9GvPo4Ua_nbL1g,38257
+crackerjack-0.39.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+crackerjack-0.39.6.dist-info/entry_points.txt,sha256=AJKNft0WXm9xoGUJ3Trl-iXHOWxRAYbagQiza3AILr4,57
+crackerjack-0.39.6.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.39.6.dist-info/RECORD,,