Merge branch 'develop'

Author: tbitcs

pyproject.toml

@@ -130,6 +130,8 @@ select = ["E", "F", "W", "I", "UP", "B", "SIM"]
 "src/specsmith/context_orchestrator.py" = ["E501"]
 # Skills module: skill body strings contain markdown content with long lines
 "src/specsmith/skills/*.py" = ["E501"]
+# MCP server module: tool schema description strings are long but cannot be split
+"src/specsmith/mcp_server.py" = ["E501"]
 # Migration files: rule description strings and template content
 "src/specsmith/migrations/m001_governance_yaml.py" = ["E501"]
 "src/specsmith/migrations/m004_ledger_esdb.py" = ["E501"]

src/specsmith/cli.py

@@ -9041,9 +9041,9 @@ def mcp_serve_cmd(project_dir: str) -> None:
         {"specsmith-governance": {"command": "specsmith", "args": ["mcp", "serve"]}}
 
     \b
-    Or pass inline to oz::
+    Or pass inline to oz (use ``specsmith mcp install-warp`` for the full snippet)::
 
-        oz agent run --mcp '{"specsmith-governance": {"command": "specsmith", "args": ["mcp", "serve"]}}' ...
+        oz agent run --mcp "$(specsmith mcp install-warp --json)" --prompt "..."
     """
     from specsmith.mcp_server import run_server
 
@@ -9065,7 +9065,9 @@ def mcp_install_warp_cmd(project_dir: str, as_json: bool) -> None:
 
     config = {
         "specsmith-governance": {
-            "command": sys.executable if os.environ.get("SPECSMITH_ALLOW_NON_PIPX") else "specsmith",
+            "command": (
+                sys.executable if os.environ.get("SPECSMITH_ALLOW_NON_PIPX") else "specsmith"
+            ),
             "args": ["mcp", "serve", "--project-dir", str(Path(project_dir).resolve())],
         }
     }

src/specsmith/mcp_server.py

@@ -35,6 +35,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import json
 import sys
 import time
@@ -229,9 +230,10 @@ def _handle_governance_checkpoint(args: dict[str, Any]) -> dict[str, Any]:
     # Project name
     project_name = root.name
     try:
-        from specsmith.paths import find_scaffold
         import yaml as _yaml
 
+        from specsmith.paths import find_scaffold
+
         sp = find_scaffold(root)
         if sp:
             raw = _yaml.safe_load(sp.read_text(encoding="utf-8")) or {}
@@ -243,7 +245,12 @@ def _handle_governance_checkpoint(args: dict[str, Any]) -> dict[str, Any]:
     phase_key, phase_label, phase_emoji, phase_pct = "unknown", "Unknown", "", 0
     failing_phase_checks: list[str] = []
     try:
-        from specsmith.phase import PHASE_MAP, phase_progress_pct, read_phase, phase_failing_checks
+        from specsmith.phase import (  # noqa: PLC0415
+            PHASE_MAP,
+            phase_failing_checks,
+            phase_progress_pct,
+            read_phase,
+        )
 
         phase_key = read_phase(root)
         phase = PHASE_MAP.get(phase_key)
@@ -573,10 +580,8 @@ def run_server(project_dir: str = ".") -> None:
 
     # Set working directory so relative paths in tool calls resolve correctly
     if project_dir and project_dir != ".":
-        try:
+        with contextlib.suppress(OSError):
             os.chdir(project_dir)
-        except OSError:
-            pass
 
     for raw_line in sys.stdin:
         raw_line = raw_line.strip()

tests/test_mcp_server.py

@@ -19,7 +19,7 @@
 from pathlib import Path
 from typing import Any
 
-import pytest
+import pytest  # noqa: I001
 
 
 # ---------------------------------------------------------------------------
@@ -386,7 +386,7 @@ def test_tools_list_via_subprocess(self) -> None:
         except subprocess.TimeoutExpired:
             pytest.skip("mcp serve subprocess timed out (slow CI env)")
 
-        lines = [l for l in proc.stdout.strip().splitlines() if l.strip()]
+        lines = [ln for ln in proc.stdout.strip().splitlines() if ln.strip()]
         assert len(lines) >= 2, f"Expected ≥2 responses, got: {lines}"
         # Last response should be tools/list result
         tools_resp = json.loads(lines[-1])