xcode-mcp-server 1.3.12__tar.gz → 1.3.13__tar.gz

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xcode-mcp-server
-Version: 1.3.12
+Version: 1.3.13
 Summary: Drew's MCP server for Xcode integration
 Project-URL: Homepage, https://github.com/drewster99/xcode-mcp-server
 Project-URL: Repository, https://github.com/drewster99/xcode-mcp-server

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/__init__.py

@@ -1,6 +1,6 @@
 """Xcode MCP Server - Model Context Protocol server for Xcode integration"""
 
-__version__ = "1.3.12"
+__version__ = "1.3.13"
 
 
 def main():

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/tools/build_project.py

@@ -13,9 +13,9 @@ from xcode_mcp_server.config_manager import apply_config
 from xcode_mcp_server.security import validate_and_normalize_project_path
 from xcode_mcp_server.exceptions import InvalidParameterError, XCodeMCPError
 from xcode_mcp_server.utils.applescript import (
-    BUILD_TIMEOUT_SECONDS,
     build_open_and_wait_applescript,
     build_wait_for_completion_applescript,
+    resolve_build_timeout,
     escape_applescript_string,
     run_applescript,
     show_notification,
@@ -289,12 +289,14 @@ def build_project(project_path: str,
                  scheme: Optional[str] = None,
                  include_warnings: Optional[bool] = None,
                  regex_filter: Optional[str] = None,
-                 max_lines: int = 25) -> str:
+                 max_lines: int = 25,
+                 timeout: Optional[int] = None) -> str:
     """
     Build the specified Xcode project or workspace.
 
-    Builds will run for up to 10 minutes before timing out. This timeout is hardcoded
-    to prevent issues with builds hanging indefinitely.
+    Builds run for up to `timeout` seconds (default 600, i.e. 10 minutes) before
+    timing out, which guards against a build that hangs indefinitely. Raise it
+    for large projects whose cold build exceeds the default.
 
     Args:
         project_path: Path to an Xcode project or workspace directory.
@@ -302,6 +304,8 @@ def build_project(project_path: str,
         include_warnings: Include warnings in build output. If not provided, uses global setting.
         regex_filter: Optional regex to filter error/warning lines
         max_lines: Maximum number of error/warning lines to show (default 25)
+        timeout: Maximum seconds to wait for the build to complete. If not
+            provided, defaults to 600. Must be a positive integer.
 
     Returns:
         Always returns JSON with format:
@@ -317,6 +321,10 @@ def build_project(project_path: str,
     if include_warnings is not None and not isinstance(include_warnings, bool):
         raise InvalidParameterError("include_warnings must be a boolean value")
 
+    # Resolve the build timeout up front so an invalid value errors immediately,
+    # before any AppleScript runs.
+    effective_timeout = resolve_build_timeout(timeout)
+
     # Validate regex_filter up front so a bad pattern produces a clear error
     # immediately, before any AppleScript runs. The supplement helper assumes
     # the pattern compiles.
@@ -340,7 +348,7 @@ def build_project(project_path: str,
     script = (
         build_open_and_wait_applescript(escaped_path, escaped_scheme)
         + '    set actionResult to build workspaceDoc\n'
-        + build_wait_for_completion_applescript("actionResult", BUILD_TIMEOUT_SECONDS)
+        + build_wait_for_completion_applescript("actionResult", effective_timeout)
         + '    set buildStatus to "unknown"\n'
         + '    try\n'
         + '        set buildStatus to status of actionResult as string\n'
@@ -359,10 +367,10 @@ def build_project(project_path: str,
         manifest_path = os.path.join(derived_data_path, "Logs", "Build", "LogStoreManifest.plist")
         pre_build_uuids = snapshot_build_uuids(manifest_path)
 
-    # The script polls inside AppleScript for up to BUILD_TIMEOUT_SECONDS; the
+    # The script polls inside AppleScript for up to effective_timeout; the
     # subprocess timeout must exceed that, with a small buffer for workspace
     # load and IPC overhead.
-    success, output = run_applescript(script, timeout=BUILD_TIMEOUT_SECONDS + 60)
+    success, output = run_applescript(script, timeout=effective_timeout + 60)
 
     if success:
         # Parse the BUILD_STATUS: prefix from the AppleScript output

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/tools/clean_project.py

@@ -2,14 +2,15 @@
 """clean_project tool - Clean an Xcode project"""
 
 import os
+from typing import Optional
 
 from xcode_mcp_server.server import mcp, TOOL_CLEAN
 from xcode_mcp_server.config_manager import apply_config
 from xcode_mcp_server.security import validate_and_normalize_project_path
 from xcode_mcp_server.exceptions import XCodeMCPError
 from xcode_mcp_server.utils.applescript import (
-    BUILD_TIMEOUT_SECONDS,
     build_open_and_wait_applescript,
+    resolve_build_timeout,
     escape_applescript_string,
     run_applescript,
     show_result_notification,
@@ -19,12 +20,14 @@ from xcode_mcp_server.utils.applescript import (
 
 @mcp.tool(annotations=TOOL_CLEAN)
 @apply_config
-def clean_project(project_path: str) -> str:
+def clean_project(project_path: str, timeout: Optional[int] = None) -> str:
     """
     Clean the specified Xcode project or workspace.
 
     Args:
         project_path: Path to an Xcode project/workspace directory.
+        timeout: Maximum seconds to wait for the clean to complete. If not
+            provided, defaults to 600. Must be a positive integer.
 
     Returns:
         Output message
@@ -32,6 +35,7 @@ def clean_project(project_path: str) -> str:
     # Validate and normalize path
     normalized_path = validate_and_normalize_project_path(project_path, "Cleaning")
     escaped_path = escape_applescript_string(normalized_path)
+    effective_timeout = resolve_build_timeout(timeout)
 
     script = build_open_and_wait_applescript(escaped_path) + (
         '    clean workspaceDoc\n'
@@ -41,7 +45,7 @@ def clean_project(project_path: str) -> str:
 
     # Clean is synchronous in AppleScript and can take minutes on large projects;
     # use the same budget as build/test rather than the short default.
-    success, output = run_applescript(script, timeout=BUILD_TIMEOUT_SECONDS + 60)
+    success, output = run_applescript(script, timeout=effective_timeout + 60)
 
     project_name = os.path.basename(normalized_path)
 

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/tools/run_project_tests.py

@@ -12,9 +12,10 @@ from xcode_mcp_server.config_manager import apply_config
 from xcode_mcp_server.security import validate_and_normalize_project_path
 from xcode_mcp_server.exceptions import InvalidParameterError
 from xcode_mcp_server.utils.applescript import (
-    BUILD_TIMEOUT_SECONDS,
     build_open_and_wait_applescript,
     build_wait_for_completion_applescript,
+    resolve_build_timeout,
+    format_timeout_duration,
     escape_applescript_string,
     run_applescript,
     show_notification,
@@ -152,16 +153,20 @@ from xcode_mcp_server.utils.xcresult import find_xcresult_bundle, extract_test_r
 @mcp.tool(annotations=TOOL_BUILD)
 @apply_config
 def run_project_tests(project_path: str,
-                     scheme: Optional[str] = None) -> str:
+                     scheme: Optional[str] = None,
+                     timeout: Optional[int] = None) -> str:
     """
     Run tests for the specified Xcode project or workspace.
 
-    Tests will run for up to 10 minutes before timing out. This timeout is hardcoded
-    to prevent issues with test runs hanging indefinitely.
+    Tests run for up to `timeout` seconds (default 600, i.e. 10 minutes) before
+    timing out, which guards against a test run hanging indefinitely. Raise it
+    for large projects whose build-for-testing alone exceeds the default.
 
     Args:
         project_path: Path to Xcode project/workspace directory
         scheme: Optional scheme to test (uses active scheme if not specified)
+        timeout: Maximum seconds to wait for the build-for-testing plus test run
+            to complete. If not provided, defaults to 600. Must be a positive integer.
 
     Returns:
         JSON with test results if tests complete, otherwise plain text status message.
@@ -176,6 +181,10 @@ def run_project_tests(project_path: str,
     # Validate and normalize the project path
     project_path = validate_and_normalize_project_path(project_path, "run_project_tests")
 
+    # Resolve the test timeout up front so an invalid value errors immediately,
+    # before any AppleScript runs or notifications post.
+    effective_timeout = resolve_build_timeout(timeout)
+
     # Show notification
     show_notification("Drew's Xcode MCP", subtitle=os.path.basename(project_path), message="Running tests")
 
@@ -275,14 +284,14 @@ def run_project_tests(project_path: str,
     script = (
         build_open_and_wait_applescript(escaped_path, escaped_scheme)
         + '    set testResult to test workspaceDoc\n'
-        + build_wait_for_completion_applescript("testResult", BUILD_TIMEOUT_SECONDS)
+        + build_wait_for_completion_applescript("testResult", effective_timeout)
         + failure_extraction_tail
         + 'end tell\n'
     )
 
-    # The script polls inside AppleScript for up to BUILD_TIMEOUT_SECONDS; the
+    # The script polls inside AppleScript for up to effective_timeout; the
     # subprocess timeout must exceed that, plus buffer for workspace load.
-    success, output = run_applescript(script, timeout=BUILD_TIMEOUT_SECONDS + 60)
+    success, output = run_applescript(script, timeout=effective_timeout + 60)
 
     if not success:
         show_error_notification("Failed to run tests", os.path.basename(project_path))
@@ -307,10 +316,10 @@ def run_project_tests(project_path: str,
     output_lines = []
 
     if not completed:
-        minutes = BUILD_TIMEOUT_SECONDS // 60
-        output_lines.append(f"⏳ Tests did not complete within {minutes} minutes")
+        duration = format_timeout_duration(effective_timeout)
+        output_lines.append(f"⏳ Tests did not complete within {duration}")
         output_lines.append(f"Status: {status}")
-        show_warning_notification(f"Tests timeout ({minutes} min)")
+        show_warning_notification(f"Tests timeout ({duration})")
         return '\n'.join(output_lines)
 
     # If tests completed, get detailed results from xcresult

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/tools/run_project_until_terminated.py

@@ -12,7 +12,8 @@ from xcode_mcp_server.config_manager import apply_config
 from xcode_mcp_server.security import validate_and_normalize_project_path
 from xcode_mcp_server.exceptions import XCodeMCPError
 from xcode_mcp_server.utils.applescript import (
-    BUILD_TIMEOUT_SECONDS,
+    resolve_build_timeout,
+    format_timeout_duration,
     build_open_and_wait_applescript,
     escape_applescript_string,
     run_applescript,
@@ -32,12 +33,14 @@ from xcode_mcp_server.utils.xcresult import (
 def run_project_until_terminated(project_path: str,
                                   scheme: Optional[str] = None,
                                   regex_filter: Optional[str] = None,
-                                  max_lines: int = 20) -> str:
+                                  max_lines: int = 20,
+                                  timeout: Optional[int] = None) -> str:
     """
-    Run the app and wait for it to terminate naturally (up to 10 minutes).
+    Run the app and wait for it to terminate naturally (up to `timeout` seconds).
 
-    The app will run in Xcode/Simulator. If it doesn't terminate within 10 minutes,
-    it will be force-stopped and runtime logs will be extracted.
+    The app will run in Xcode/Simulator. If it doesn't terminate within `timeout`
+    seconds (default 600, i.e. 10 minutes), it will be force-stopped and runtime
+    logs will be extracted.
 
     No user interaction required - fully automated.
 
@@ -48,6 +51,9 @@ def run_project_until_terminated(project_path: str,
         scheme: Optional scheme to run. If not provided, uses the active scheme.
         regex_filter: Optional regex pattern to find matching lines in the output
         max_lines: Maximum number of matching lines to return (default 20)
+        timeout: Maximum seconds to wait for the app to terminate before
+            force-stopping it. If not provided, defaults to 600. Must be a
+            positive integer.
 
     Returns:
         JSON string with structured console output
@@ -56,6 +62,7 @@ def run_project_until_terminated(project_path: str,
     scheme_desc = scheme if scheme else "active scheme"
     normalized_path = validate_and_normalize_project_path(project_path, f"Running {scheme_desc} in")
     escaped_path = escape_applescript_string(normalized_path)
+    effective_timeout = resolve_build_timeout(timeout)
 
     # Show running notification
     project_name = os.path.basename(normalized_path)
@@ -83,13 +90,12 @@ def run_project_until_terminated(project_path: str,
         show_error_notification("Failed to launch app", project_name)
         raise XCodeMCPError(f"Launch failed: {output}")
 
-    print(f"App launched, polling for termination (up to {BUILD_TIMEOUT_SECONDS // 60} minutes)...", file=sys.stderr)
+    print(f"App launched, polling for termination (up to {format_timeout_duration(effective_timeout)})...", file=sys.stderr)
 
-    timeout = BUILD_TIMEOUT_SECONDS
     elapsed = 0
     app_terminated = False
 
-    while elapsed < timeout:
+    while elapsed < effective_timeout:
         # Check if app terminated
         check_script = f'''
         set projectPath to "{escaped_path}"
@@ -112,9 +118,9 @@ def run_project_until_terminated(project_path: str,
 
     # If still running after timeout, force-stop
     if not app_terminated:
-        minutes = BUILD_TIMEOUT_SECONDS // 60
-        print(f"App did not terminate within {minutes} minutes, force-stopping...", file=sys.stderr)
-        show_warning_notification(f"App timeout ({minutes} min)", "Force-stopping app")
+        duration = format_timeout_duration(effective_timeout)
+        print(f"App did not terminate within {duration}, force-stopping...", file=sys.stderr)
+        show_warning_notification(f"App timeout ({duration})", "Force-stopping app")
 
         stop_script = f'''
         set projectPath to "{escaped_path}"

{xcode_mcp_server-1.3.12 → xcode_mcp_server-1.3.13}/xcode_mcp_server/utils/applescript.py

@@ -8,7 +8,7 @@ import threading
 from collections import deque
 from typing import Tuple, List, Dict, Optional
 
-from xcode_mcp_server.exceptions import XCodeMCPError
+from xcode_mcp_server.exceptions import XCodeMCPError, InvalidParameterError
 
 # Global notification setting - initialized by CLI
 NOTIFICATIONS_ENABLED = True
@@ -27,8 +27,9 @@ _NOTIFICATION_HISTORY_LOCK = threading.Lock()
 # workspace document to load.
 WORKSPACE_LOAD_REPEATS = 60
 
-# Maximum time (seconds) to wait for a build or run action to complete in
-# AppleScript polling loops.
+# Default maximum time (seconds) to wait for a build or run action to complete
+# in AppleScript polling loops. Used when a caller doesn't pass an explicit
+# `timeout` — see resolve_build_timeout.
 BUILD_TIMEOUT_SECONDS = 600
 
 # Default subprocess timeout for `osascript` invocations that are expected to
@@ -116,6 +117,19 @@ def build_open_and_wait_applescript(escaped_path: str, escaped_scheme: Optional[
     )
 
 
+def format_timeout_duration(seconds: int) -> str:
+    """Render a timeout as human-readable text for user-facing messages.
+
+    Uses whole minutes only when the value is a clean minute multiple (so the
+    common 600s default reads as "10 minutes"); otherwise reports seconds, so a
+    short caller-supplied timeout reads as "5 seconds" rather than "0 minutes".
+    """
+    if seconds >= 60 and seconds % 60 == 0:
+        minutes = seconds // 60
+        return f"{minutes} minute" + ("" if minutes == 1 else "s")
+    return f"{seconds} second" + ("" if seconds == 1 else "s")
+
+
 def build_wait_for_completion_applescript(
     result_var: str = "actionResult",
     timeout_seconds: int = BUILD_TIMEOUT_SECONDS,
@@ -128,13 +142,13 @@ def build_wait_for_completion_applescript(
         result_var: AppleScript variable holding a scheme-action-result.
         timeout_seconds: Seconds before the loop errors out.
     """
-    minutes = timeout_seconds // 60
+    duration = format_timeout_duration(timeout_seconds)
     return (
         f'    set buildWaitTime to 0\n'
         f'    repeat\n'
         f'        if completed of {result_var} is true then exit repeat\n'
         f'        if buildWaitTime >= {timeout_seconds} then\n'
-        f'            error "Build timed out after {minutes} minutes"\n'
+        f'            error "Build timed out after {duration}"\n'
         f'        end if\n'
         f'        delay 0.5\n'
         f'        set buildWaitTime to buildWaitTime + 0.5\n'
@@ -142,6 +156,35 @@ def build_wait_for_completion_applescript(
     )
 
 
+def resolve_build_timeout(timeout: Optional[int]) -> int:
+    """Resolve the effective build/test timeout in seconds for a tool call.
+
+    Args:
+        timeout: Per-call override in seconds, or None to use the default
+            BUILD_TIMEOUT_SECONDS.
+
+    Returns:
+        The validated timeout in seconds. The caller threads this into BOTH the
+        inner AppleScript poll budget (build_wait_for_completion_applescript)
+        and the outer run_applescript subprocess timeout so the two stay
+        consistent.
+
+    Raises:
+        InvalidParameterError: If `timeout` is provided but is not a positive
+            integer number of seconds. Short timeouts (e.g. 5) are allowed; the
+            caller owns that trade-off.
+    """
+    if timeout is None:
+        return BUILD_TIMEOUT_SECONDS
+    # bool is a subclass of int; reject it explicitly so True/False can't slip
+    # through as 1/0.
+    if isinstance(timeout, bool) or not isinstance(timeout, int):
+        raise InvalidParameterError("timeout must be an integer number of seconds")
+    if timeout <= 0:
+        raise InvalidParameterError("timeout must be a positive number of seconds")
+    return timeout
+
+
 def run_applescript(script: str, timeout: int = DEFAULT_APPLESCRIPT_TIMEOUT) -> Tuple[bool, str]:
     """Run an AppleScript and return success status and output.