@pennyfarthing/core 11.2.0 → 11.2.1

package/pennyfarthing_scripts/pretooluse_hook.py

@@ -1,192 +1,10 @@
-#!/usr/bin/env python3
 """
-Cyclist PreToolUse Hook (Python)
+Backward-compatibility shim — pretooluse hook moved to hooks/cyclist_pretooluse.py.
 
-This script is called by Claude Code before each tool execution.
-It communicates with WheelHub (Cyclist's central coordination server)
-via HTTP to get approval decisions.
-
-Flow:
-1. Claude Code calls this script with tool info via stdin (JSON)
-2. Script reads port from .wheelhub-port in project directory
-3. Script sends request to WheelHub's /api/hook-request endpoint
-4. WheelHub shows approval modal, user decides
-5. Script receives response, outputs JSON decision to stdout
-6. Claude Code proceeds or blocks based on decision
-
-Per ADR-0004: All communication converges through WheelHub.
-
-Story: MSSCI-12409 - Hook consistency and WheelHub consolidation
-
-Usage:
-  Install in ~/.claude/settings.json or project .claude/settings.json:
-  {
-    "hooks": {
-      "PreToolUse": [{
-        "matcher": "Bash",
-        "hooks": [{
-          "type": "command",
-          "command": "python3 /path/to/pretooluse_hook.py"
-        }]
-      }]
-    }
-  }
+This file will be removed in a future version.
 """
 
-import sys
-from pathlib import Path
-
-# Add parent directory to path for imports
-sys.path.insert(0, str(Path(__file__).parent))
-
-from hooks import (
-    HookResponse,
-    find_project_root,
-    get_context_state,
-    is_cyclist_running,
-    load_settings,
-    output_hook_response,
-    read_stdin_json,
-    send_to_cyclist,
-)
-
-
-def _resolve_agent(session_id: str | None, project_root: Path | None) -> str | None:
-    """Resolve agent name from session file.
-
-    Looks up .session/agents/{session_id} to find the active agent name.
-    Falls back to the most recently modified agent file if session_id
-    doesn't match.
-
-    Args:
-        session_id: Claude Code session ID
-        project_root: Project root directory
-
-    Returns:
-        Agent name string, or None if not found
-    """
-    if not project_root:
-        return None
-
-    agents_dir = project_root / ".session" / "agents"
-    if not agents_dir.is_dir():
-        return None
-
-    # Try exact session_id match first
-    if session_id:
-        agent_file = agents_dir / session_id
-        if agent_file.is_file():
-            try:
-                return agent_file.read_text().strip() or None
-            except OSError:
-                pass
-
-    # Fallback: most recently modified agent file
-    try:
-        agent_files = sorted(
-            (f for f in agents_dir.iterdir() if f.is_file()),
-            key=lambda f: f.stat().st_mtime,
-            reverse=True,
-        )
-        if agent_files:
-            return agent_files[0].read_text().strip() or None
-    except OSError:
-        pass
-
-    return None
-
-
-def main() -> None:
-    """Main entry point for PreToolUse hook."""
-    try:
-        # Read tool data from Claude Code
-        tool_data = read_stdin_json()
-
-        # Extract relevant fields
-        tool_name = tool_data.get("tool_name", "")
-        tool_id = tool_data.get("tool_use_id", "")
-        tool_input = tool_data.get("tool_input", {})
-        session_id = tool_data.get("session_id")
-
-        # Find project root
-        project_root = find_project_root()
-
-        # Resolve agent name from session file (MSSCI-14392)
-        agent_name = _resolve_agent(session_id, project_root)
-
-        # Check if Cyclist is running
-        if not is_cyclist_running(project_root):
-            # No Cyclist - pass through to Claude Code's built-in permissions
-            # Using "allow" so the hook doesn't override Claude Code's own
-            # permission system (settings.json allow lists still apply)
-            sys.exit(0)
-
-        # Load settings to check for auto-approval mode
-        settings = load_settings(project_root)
-        if settings.permission_mode == "accept":
-            # Auto-accept mode - approve everything
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="allow",
-                reason="Auto-accept mode enabled",
-            ))
-            sys.exit(0)
-
-        # Get context state for inclusion in request
-        context = get_context_state(project_root)
-
-        # Build request data
-        request_data = {
-            "toolName": tool_name,
-            "toolId": tool_id,
-            "input": tool_input,
-            "sessionId": session_id,
-            "context": {
-                "percentage": context.percentage,
-                "isHigh": context.is_high,
-                "isCritical": context.is_critical,
-            },
-        }
-        # Include agent identity if resolved (MSSCI-14392)
-        if agent_name:
-            request_data["agent"] = agent_name
-
-        # Send approval request to WheelHub with context info
-        response = send_to_cyclist(
-            endpoint="/api/hook-request",
-            data=request_data,
-            project_root=project_root,
-        )
-
-        if response is None:
-            # Connection failed - defer to Claude Code
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="ask",
-                reason="Could not connect to WheelHub",
-            ))
-            sys.exit(0)
-
-        # Extract decision from response
-        decision = response.get("decision", "ask")
-        reason = response.get("reason", "")
-        data = response.get("data")
-
-        # Output decision
-        output_hook_response(HookResponse(
-            event_name="PreToolUse",
-            decision=decision,
-            reason=reason,
-            updated_input=data,
-        ))
-        sys.exit(0)
-
-    except Exception as e:
-        # On error, output to stderr and exit with code 0 (allow)
-        # We don't want hook failures to block the user
-        print(f"[pretooluse-hook] Error: {e}", file=sys.stderr)
-        sys.exit(0)
-
+from pennyfarthing_scripts.hooks.cyclist_pretooluse import main  # noqa: F401
 
 if __name__ == "__main__":
     main()

package/pennyfarthing_scripts/prime/workflow.py

@@ -104,8 +104,9 @@ def parse_session_header(session_path: Path) -> dict[str, Any]:
 
             if key == "workflow":
                 result["workflow"] = value.lower()
-            elif key == "current phase":
+            elif key in ("current phase", "phase"):
                 # Extract phase name, handling "(APPROVED)" suffix
+                # Matches both "**Current Phase:**" and "**Phase:**"
                 phase_match = re.match(r"(\w+)(?:\s*\(([^)]+)\))?", value)
                 if phase_match:
                     result["phase"] = phase_match.group(1).lower()

package/pennyfarthing_scripts/schema_validation_hook.py

@@ -1,305 +1,10 @@
-#!/usr/bin/env python3
 """
-XML Schema Validation Hook for PreToolUse.
+Backward-compatibility shim — schema validation hook moved to hooks/schema_validation.py.
 
-Validates session, skill, and workflow step files on Write/Edit operations.
-Blocks the tool call if validation fails, providing immediate feedback.
-
-Usage in settings.json:
-{
-  "hooks": {
-    "PreToolUse": [{
-      "matcher": "Write|Edit",
-      "hooks": [{
-        "type": "command",
-        "command": "python3 -m pennyfarthing_scripts.schema_validation_hook"
-      }]
-    }]
-  }
-}
-
-Story: XML Schema Migration Tools
+This file will be removed in a future version.
 """
 
-import re
-import sys
-from pathlib import Path
-
-# Add parent directory to path for imports
-sys.path.insert(0, str(Path(__file__).parent))
-
-from hooks import (
-    HookResponse,
-    output_hook_response,
-    read_stdin_json,
-)
-
-# =============================================================================
-# File Type Detection
-# =============================================================================
-
-
-def is_session_file(file_path: str) -> bool:
-    """Check if path is a session file."""
-    return file_path.endswith("-session.md") and ".session/" in file_path
-
-
-def is_skill_file(file_path: str) -> bool:
-    """Check if path is a skill SKILL.md file."""
-    return file_path.endswith("/SKILL.md") and "/skills/" in file_path
-
-
-def is_step_file(file_path: str) -> bool:
-    """Check if path is a workflow step file."""
-    path = Path(file_path)
-    return (
-        path.name.startswith("step-")
-        and path.name.endswith(".md")
-        and "/workflows/" in file_path
-        and "/steps/" in file_path
-    )
-
-
-def get_file_type(file_path: str) -> str | None:
-    """Detect file type from path."""
-    if is_session_file(file_path):
-        return "session"
-    elif is_skill_file(file_path):
-        return "skill"
-    elif is_step_file(file_path):
-        return "step"
-    return None
-
-
-# =============================================================================
-# Content-Based Validation (inline to avoid import issues)
-# =============================================================================
-
-# Skill required tags
-SKILL_REQUIRED_TAGS = ["run", "output"]
-
-# Workflow step required tags
-STEP_REQUIRED_TAGS = ["purpose", "instructions", "output"]
-
-# Step meta required fields
-STEP_META_FIELDS = ["step", "workflow", "agent", "next"]
-
-
-def _has_tag(content: str, tag: str) -> bool:
-    """Check if content contains a specific XML tag."""
-    return f"<{tag}>" in content or f"<{tag} " in content
-
-
-def validate_session_content(content: str) -> list[str]:
-    """Validate session file content.
-
-    Args:
-        content: File content to validate
-
-    Returns:
-        List of error messages (empty if valid)
-    """
-    errors = []
-
-    # Check for XML format indicator
-    if "<session" not in content:
-        # Old markdown format - warn but don't block during migration
-        return []
-
-    # Validate <session> root with attributes
-    if not re.search(r'<session\s+story="[^"]+"', content):
-        errors.append("Missing story attribute on <session>")
-
-    if not re.search(r'<session[^>]+workflow="[^"]+"', content):
-        errors.append("Missing workflow attribute on <session>")
-
-    # Validate <meta> section
-    if not _has_tag(content, "meta"):
-        errors.append("Missing <meta> section")
-    else:
-        if "<jira>" not in content:
-            errors.append("Missing <jira> in <meta>")
-        if "<started>" not in content:
-            errors.append("Missing <started> in <meta>")
-
-    # Validate <status> element
-    if not _has_tag(content, "status"):
-        errors.append("Missing <status> element")
-    else:
-        if 'phase="' not in content:
-            errors.append("Missing phase attribute on <status>")
-
-    return errors
-
-
-def validate_skill_content(content: str) -> list[str]:
-    """Validate skill file content.
-
-    Args:
-        content: File content to validate
-
-    Returns:
-        List of error messages (empty if valid)
-    """
-    errors = []
-
-    # Check YAML frontmatter
-    if not content.startswith("---\n"):
-        errors.append("Missing YAML frontmatter")
-    else:
-        parts = content.split("---", 2)
-        if len(parts) >= 2:
-            frontmatter = parts[1]
-            if "name:" not in frontmatter:
-                errors.append("Missing 'name' in frontmatter")
-            if "description:" not in frontmatter:
-                errors.append("Missing 'description' in frontmatter")
-
-    # Check required tags
-    for tag in SKILL_REQUIRED_TAGS:
-        if not _has_tag(content, tag):
-            errors.append(f"Missing <{tag}> tag (required)")
-
-    return errors
-
-
-def validate_step_content(content: str) -> list[str]:
-    """Validate workflow step file content.
-
-    Args:
-        content: File content to validate
-
-    Returns:
-        List of error messages (empty if valid)
-    """
-    errors = []
-
-    # Check required tags
-    for tag in STEP_REQUIRED_TAGS:
-        if not _has_tag(content, tag):
-            errors.append(f"Missing <{tag}> tag")
-
-    # Check step-meta fields if tag exists
-    if _has_tag(content, "step-meta"):
-        meta_match = re.search(r"<step-meta>(.+?)</step-meta>", content, re.DOTALL)
-        if meta_match:
-            meta_content = meta_match.group(1)
-            for field_name in STEP_META_FIELDS:
-                if f"{field_name}:" not in meta_content:
-                    errors.append(f"Missing '{field_name}' in step-meta")
-
-    return errors
-
-
-def validate_content(file_path: str, content: str) -> list[str]:
-    """Validate content based on file type.
-
-    Args:
-        file_path: Path to file being written
-        content: Content being written
-
-    Returns:
-        List of error messages (empty if valid)
-    """
-    file_type = get_file_type(file_path)
-
-    if file_type == "session":
-        return validate_session_content(content)
-    elif file_type == "skill":
-        return validate_skill_content(content)
-    elif file_type == "step":
-        return validate_step_content(content)
-
-    return []
-
-
-# =============================================================================
-# Hook Entry Point
-# =============================================================================
-
-
-def main() -> None:
-    """Main entry point for schema validation hook."""
-    try:
-        # Read tool data from Claude Code
-        tool_data = read_stdin_json()
-
-        tool_name = tool_data.get("tool_name", "")
-        tool_input = tool_data.get("tool_input", {})
-
-        # Only process Write and Edit tools
-        if tool_name not in ("Write", "Edit"):
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="allow",
-                reason="Not a Write/Edit operation",
-            ))
-            sys.exit(0)
-
-        # Get file path
-        file_path = tool_input.get("file_path", "")
-        if not file_path:
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="allow",
-                reason="No file path",
-            ))
-            sys.exit(0)
-
-        # Check if this is a file we care about
-        file_type = get_file_type(file_path)
-        if not file_type:
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="allow",
-                reason="Not a session/skill/step file",
-            ))
-            sys.exit(0)
-
-        # Get content to validate
-        # For Write: use 'content'
-        # For Edit: we need to simulate the edit result
-        if tool_name == "Write":
-            content = tool_input.get("content", "")
-        else:
-            # Edit operation - we can't easily validate without reading the file
-            # For now, allow Edits and validate on Write only
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="allow",
-                reason="Edit operations validated post-hoc",
-            ))
-            sys.exit(0)
-
-        # Validate content
-        errors = validate_content(file_path, content)
-
-        if errors:
-            # Block the write
-            error_msg = f"Schema validation failed for {file_type} file:\n"
-            error_msg += "\n".join(f"  - {e}" for e in errors)
-            error_msg += f"\n\nFile: {file_path}"
-
-            output_hook_response(HookResponse(
-                event_name="PreToolUse",
-                decision="deny",
-                reason=error_msg,
-            ))
-            sys.exit(0)
-
-        # Validation passed
-        output_hook_response(HookResponse(
-            event_name="PreToolUse",
-            decision="allow",
-            reason=f"Schema validation passed for {file_type} file",
-        ))
-        sys.exit(0)
-
-    except Exception as e:
-        # On error, allow to avoid blocking legitimate work
-        print(f"[schema-validation-hook] Error: {e}", file=sys.stderr)
-        sys.exit(0)
-
+from pennyfarthing_scripts.hooks.schema_validation import main  # noqa: F401
 
 if __name__ == "__main__":
     main()