@pennyfarthing/core 11.1.0 → 11.2.0

package/pennyfarthing_scripts/git_group/cli.py

@@ -5,15 +5,16 @@ Usage:
     pf git [COMMAND] [ARGS]...
 
 Commands:
-    status    Check git status of all project repos
-    cleanup   Organize changes into proper commits/branches
-    branches  Create feature branches from a story
-    release   Interactive release with verification gates
+    status       Check git status of all project repos
+    cleanup      Organize changes into proper commits/branches
+    branches     Create feature branches from a story
+    worktree     Manage git worktrees for parallel work
+    install-hooks Install git hooks with .d/ dispatcher pattern
 """
 
-import click
+import asyncio
 
-from pennyfarthing_scripts.common.config import get_project_root
+import click
 
 
 @click.group()
@@ -22,10 +23,11 @@ def git():
 
     \b
     Commands:
-      status    - Check git status of all repos
-      cleanup   - Organize changes into commits/branches
-      branches  - Create feature branches from a story
-      release   - Interactive release with verification gates
+      status        - Check git status of all repos
+      cleanup       - Organize changes into commits/branches
+      branches      - Create feature branches from a story
+      worktree      - Manage git worktrees for parallel work
+      install-hooks - Install git hooks with .d/ dispatcher
     """
     pass
 
@@ -37,21 +39,38 @@ def status(brief: bool):
 
     Shows branch, uncommitted changes, and ahead/behind status for each repo.
     """
-    import subprocess
+    from pennyfarthing_scripts.git.repos import get_repo_paths, load_repos_config
+    from pennyfarthing_scripts.git.status_all import (
+        format_status_brief,
+        format_status_full,
+        format_summary,
+        get_all_repo_status,
+    )
 
-    root = get_project_root()
-    script = root / ".pennyfarthing" / "scripts" / "git" / "git-status-all.sh"
+    repo_paths = get_repo_paths()
+    config = load_repos_config()
 
-    if not script.is_file():
-        click.echo("Error: git-status-all.sh not found", err=True)
-        raise SystemExit(1)
+    # Build repo list with per-repo upstream refs
+    repos_with_upstream: list[tuple[str, object, str]] = []
+    for name, path in repo_paths:
+        upstream = config[name].upstream_ref if name in config else "origin/main"
+        repos_with_upstream.append((name, path, upstream))
+
+    statuses = asyncio.run(get_all_repo_status(repos_with_upstream))
 
-    cmd = [str(script)]
     if brief:
-        cmd.append("--brief")
+        click.echo(format_status_brief(statuses))
+    else:
+        click.echo("━" * 40)
+        click.echo("  Git Status - All Repos")
+        click.echo("━" * 40)
+        click.echo()
+        click.echo(format_status_full(statuses))
+        click.echo("━" * 40)
+        click.echo(format_summary(statuses))
 
-    result = subprocess.run(cmd, cwd=str(root))
-    raise SystemExit(result.returncode)
+    has_issues = any(not s.is_clean or s.has_unpushed for s in statuses)
+    raise SystemExit(1 if has_issues else 0)
 
 
 @git.command()
@@ -67,34 +86,118 @@ def cleanup():
 
 
 @git.command()
-@click.argument("story_id")
-def branches(story_id: str):
-    """Create feature branches in both repos from a story.
+@click.argument("branch_name")
+@click.option(
+    "--repos",
+    type=click.Choice(["all", "api", "ui"]),
+    default="all",
+    help="Which repos to target",
+)
+def branches(branch_name: str, repos: str):
+    """Create feature branches across all configured repos.
 
     \b
     Arguments:
-      STORY_ID  - The story ID to create branches for (e.g., 86-3)
+      BRANCH_NAME  - The branch name to create (e.g., feat/86-3-file-upload)
     """
-    import subprocess
+    from pennyfarthing_scripts.git.create_branches import (
+        create_feature_branches,
+        detect_worktree,
+        filter_repos,
+        format_results,
+    )
+    from pennyfarthing_scripts.git.repos import get_repo_paths
+
+    is_worktree, worktree_name, _ = detect_worktree()
+    if is_worktree:
+        click.echo(f"📂 Detected worktree: {worktree_name}")
+    else:
+        click.echo("📂 Using main checkout")
+
+    all_repos = get_repo_paths()
+    filtered = filter_repos(all_repos, repos)
+
+    if not filtered:
+        click.echo(f"No repos match filter: {repos}", err=True)
+        raise SystemExit(1)
 
-    root = get_project_root()
-    script = root / ".pennyfarthing" / "scripts" / "git" / "create-branches.sh"
+    results = asyncio.run(create_feature_branches(filtered, branch_name))
+    click.echo(format_results(results, branch_name))
 
-    if not script.is_file():
-        click.echo("Error: create-branches.sh not found", err=True)
-        raise SystemExit(1)
+    from pennyfarthing_scripts.git.create_branches import BranchAction
 
-    result = subprocess.run([str(script), story_id], cwd=str(root))
-    raise SystemExit(result.returncode)
+    has_errors = any(r.action == BranchAction.ERROR for r in results)
+    raise SystemExit(1 if has_errors else 0)
 
 
-@git.command()
-def release():
-    """Interactive release with verification gates.
+# Worktree subgroup
+@git.group()
+def worktree():
+    """Manage git worktrees for parallel development.
+
+    \b
+    Commands:
+      create  - Create worktree(s) for parallel work
+      remove  - Remove worktree and clean up
+      list    - List all active worktrees
+      status  - Show detailed worktree status
+    """
+    pass
 
-    Starts the release stepped workflow via BikeLane.
-    Equivalent to: /pf-workflow start release
+
+@worktree.command("create")
+@click.argument("name")
+@click.argument("branch")
+@click.option(
+    "--repos",
+    default="all",
+    help="Repos filter: all, api, ui, or comma-separated names",
+)
+def worktree_create(name: str, branch: str, repos: str):
+    """Create worktree(s) for parallel work.
+
+    \b
+    Arguments:
+      NAME    - Worktree name (e.g., wt-5-3a)
+      BRANCH  - Branch name (e.g., feat/5-3a-file-upload)
     """
-    click.echo("Starting release workflow...")
-    click.echo("Run: /pf-workflow start release")
-    click.echo("Or:  pf workflow start release")
+    from pennyfarthing_scripts.git.worktree import create_worktree
+
+    raise SystemExit(create_worktree(name, branch, repos))
+
+
+@worktree.command("remove")
+@click.argument("name")
+def worktree_remove(name: str):
+    """Remove worktree and clean up."""
+    from pennyfarthing_scripts.git.worktree import remove_worktree
+
+    raise SystemExit(remove_worktree(name))
+
+
+@worktree.command("list")
+def worktree_list():
+    """List all active worktrees."""
+    from pennyfarthing_scripts.git.worktree import list_worktrees
+
+    raise SystemExit(list_worktrees())
+
+
+@worktree.command("status")
+def worktree_status():
+    """Show detailed worktree status."""
+    from pennyfarthing_scripts.git.worktree import show_worktree_status
+
+    raise SystemExit(show_worktree_status())
+
+
+@git.command("install-hooks")
+def install_hooks():
+    """Install git hooks with .d/ dispatcher pattern.
+
+    Creates .d/ directories, symlinks pennyfarthing hooks, and
+    migrates existing user hooks.
+    """
+    from pennyfarthing_scripts.git.hooks_installer import install_git_hooks
+
+    raise SystemExit(install_git_hooks())

package/pennyfarthing_scripts/handoff/complete_phase.py

@@ -53,6 +53,18 @@ def complete_phase(
         }
 
     content = session_path.read_text()
+
+    # Guard: require assessment section before allowing gated phase transitions.
+    # Skip/manual transitions (e.g. setup→implement) don't need assessments.
+    if gate_type not in ("skip", "manual", "-", None, "") and not re.search(
+        r"^##\s+.*Assessment", content, re.MULTILINE
+    ):
+        return {
+            "status": "error",
+            "session_file": str(session_path),
+            "error": "No assessment found in session file. Write your assessment before completing the phase.",
+        }
+
     now = datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%SZ")
 
     from_agent = _get_phase_agent(project_root, workflow, from_phase)

package/pennyfarthing_scripts/handoff/resolve_gate.py

@@ -1,14 +1,14 @@
 """Resolve gate for current workflow phase.
 
-Reads workflow YAML, finds current phase gate, checks for assessment
-section in session file, and returns a structured RESOLVE_RESULT.
+Reads workflow YAML, finds current phase gate, and returns gate info.
+Assessment checks are enforced in complete_phase (not here) to avoid
+race conditions where agents call resolve-gate before writing assessments.
 
 Story: 105-1 (Script-First Handoff)
 """
 
 from __future__ import annotations
 
-import re
 from pathlib import Path
 
 import yaml
@@ -95,22 +95,13 @@ def resolve_gate(
             assessment_found=True,
         )
 
-    session_path = project_root / ".session" / f"{story_id}-session.md"
-    assessment_found = False
-    if session_path.exists():
-        content = session_path.read_text()
-        assessment_found = bool(
-            re.search(r"^##\s+.*Assessment", content, re.MULTILINE)
-        )
-
-    status = "ready" if assessment_found else "blocked"
     return _result(
-        status=status,
+        status="ready",
         gate_type=gate_type,
         gate_file=gate_file,
         next_agent=next_agent,
         next_phase=next_phase,
-        assessment_found=assessment_found,
+        assessment_found=True,
     )
 
 

package/pennyfarthing_scripts/hooks.py

@@ -30,10 +30,7 @@ import yaml
 
 # WheelHub port file - central coordination server for all communication
 # Per ADR-0004: "the hub where all communication converges"
-CYCLIST_PORT_FILE = ".cyclist-port"
-
-# Legacy approval port file (deprecated, for backwards compatibility during migration)
-CYCLIST_APPROVAL_PORT_FILE_LEGACY = ".cyclist-approval-port"
+CYCLIST_PORT_FILE = ".wheelhub-port"
 
 # Default port if file not found
 DEFAULT_CYCLIST_PORT = 7431
@@ -51,7 +48,7 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
     """Find the project root by looking for marker files.
 
     Searches for (in order):
-    1. .cyclist-port or .cyclist-approval-port (Cyclist is running)
+    1. .wheelhub-port (WheelHub is running)
     2. .pennyfarthing directory
     3. .claude directory
 
@@ -68,8 +65,6 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
         # Check for Cyclist port files first (indicates Cyclist is running)
         if (current / CYCLIST_PORT_FILE).exists():
             return current
-        if (current / CYCLIST_APPROVAL_PORT_FILE_LEGACY).exists():
-            return current
         # Fall back to directory markers
         if (current / ".pennyfarthing").is_dir():
             return current
@@ -89,7 +84,7 @@ def read_port_file(file_name: str, project_root: Path | None = None) -> int | No
     """Read a port number from a Cyclist port file.
 
     Args:
-        file_name: Name of the port file (.cyclist-port or .cyclist-approval-port)
+        file_name: Name of the port file (e.g. .wheelhub-port)
         project_root: Project root directory (auto-detected if not provided)
 
     Returns:
@@ -130,18 +125,9 @@ def get_cyclist_port(project_root: Path | None = None) -> int:
     if port:
         return port
 
-    # Fallback to legacy approval port file during migration
-    legacy_port = read_port_file(CYCLIST_APPROVAL_PORT_FILE_LEGACY, project_root)
-    if legacy_port:
-        return legacy_port
-
     return DEFAULT_CYCLIST_PORT
 
 
-# Alias for backwards compatibility
-get_approval_port = get_cyclist_port
-
-
 # =============================================================================
 # Settings Loading
 # =============================================================================

package/pennyfarthing_scripts/pretooluse_hook.py

@@ -8,7 +8,7 @@ via HTTP to get approval decisions.
 
 Flow:
 1. Claude Code calls this script with tool info via stdin (JSON)
-2. Script reads port from .cyclist-port in project directory
+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