@pennyfarthing/core 11.3.7 → 11.4.0

package/pennyfarthing-dist/pf/settings/settings.py

@@ -11,7 +11,27 @@ import yaml
 from pf.common.config import get_project_root, load_pennyfarthing_config
 
 # Top-level keys to show in `pf settings show` (skip layout/panel blobs)
-SHOW_KEYS = ("theme", "workflow", "jira", "display", "split", "last_panel")
+SHOW_KEYS = ("theme", "bell_mode", "relay_mode", "permission_mode", "workflow", "jira", "display", "split", "last_panel")
+
+# Default values for all known settings
+DEFAULTS: dict[str, Any] = {
+    "theme": "firefly",
+    "bell_mode": "standard",
+    "relay_mode": False,
+    "permission_mode": "standard",
+    "workflow": {
+        "bell_mode": False,
+        "git_monitor": False,
+        "relay_mode": False,
+        "permission_mode": "standard",
+        "pr_mode": "draft",
+        "pr_merge": "auto",
+    },
+    "display": {
+        "colorPreset": "catppuccin",
+    },
+    "last_panel": "sprint",
+}
 
 
 def _coerce_value(value: str) -> Any:
@@ -74,25 +94,41 @@ def set_setting(key: str, value: str) -> dict:
     return config
 
 
+def _deep_merge(base: dict, override: dict) -> dict:
+    """Deep-merge override into base, returning a new dict."""
+    result = dict(base)
+    for k, v in override.items():
+        if k in result and isinstance(result[k], dict) and isinstance(v, dict):
+            result[k] = _deep_merge(result[k], v)
+        else:
+            result[k] = v
+    return result
+
+
 def show_settings() -> str:
-    """Format interesting top-level settings for display."""
+    """Format all settings with defaults, annotating which are user-set."""
     config = load_pennyfarthing_config()
+    merged = _deep_merge(DEFAULTS, config)
     lines: list[str] = []
 
     for key in SHOW_KEYS:
-        if key not in config:
+        if key not in merged:
             continue
-        val = config[key]
+        val = merged[key]
+        is_set = key in config
+        suffix = "" if is_set else "  # (default)"
         if isinstance(val, dict):
             lines.append(f"{key}:")
+            user_dict = config.get(key, {}) if isinstance(config.get(key), dict) else {}
             for k, v in val.items():
+                k_suffix = "" if k in user_dict else "  # (default)"
                 if isinstance(v, dict):
                     nested = yaml.dump({k: v}, default_flow_style=False, sort_keys=False)
-                    for line in nested.rstrip().split("\n"):
-                        lines.append(f"  {line}")
+                    for i, line in enumerate(nested.rstrip().split("\n")):
+                        lines.append(f"  {line}{k_suffix if i == 0 else ''}")
                 else:
-                    lines.append(f"  {k}: {v}")
+                    lines.append(f"  {k}: {v}{k_suffix}")
         else:
-            lines.append(f"{key}: {val}")
+            lines.append(f"{key}: {val}{suffix}")
 
     return "\n".join(lines) if lines else "(no settings found)"

package/pennyfarthing-dist/pf/sprint/story_finish.py

@@ -133,10 +133,14 @@ def finish_story(
     )
 
     if dry_run:
+        from pf.common.pr_config import get_pr_merge_mode
+
         steps.append({"step": 1, "action": f"Archive session → {archive_dir / archive_name}"})
         if dialogue_path.exists():
             steps.append({"step": "1b", "action": f"Archive dialogue → {archive_dir / dialogue_archive_name}"})
-        if pr_number:
+        if pr_number and get_pr_merge_mode() == "human":
+            steps.append({"step": 2, "action": f"PR #{pr_number} — waiting for human review and merge"})
+        elif pr_number:
             steps.append({"step": 2, "action": f"Merge PR #{pr_number} (squash, delete branch)"})
         else:
             steps.append({"step": 2, "action": "No PR to merge"})
@@ -162,7 +166,15 @@ def finish_story(
         steps.append({"step": "1b", "action": "archive_dialogue", "dest": str(dialogue_dest)})
 
     # --- Step 2: Merge PR ---
-    if pr_number:
+    from pf.common.pr_config import get_pr_merge_mode
+
+    pr_merge_mode = get_pr_merge_mode()
+    if pr_number and pr_merge_mode == "human":
+        steps.append({
+            "step": 2, "action": "merge_pr", "pr": pr_number,
+            "mode": "human", "message": f"PR #{pr_number} ready for human review and merge",
+        })
+    elif pr_number:
         result = _run(["gh", "pr", "merge", pr_number, "--squash", "--delete-branch"])
         if result.returncode == 0:
             steps.append({"step": 2, "action": "merge_pr", "pr": pr_number})

package/pennyfarthing-dist/pf/sprint/validator.py

@@ -66,11 +66,11 @@ class ValidationResult:
 
 VALID_SPRINT_STATUSES = {"active", "closed"}
 VALID_STORY_STATUSES = {"backlog", "ready", "in_progress", "done", "canceled", "planning"}
-JIRA_KEY_PATTERN = re.compile(r"^MSSCI-\d{5}$")
+JIRA_KEY_PATTERN = re.compile(r"^[A-Z][A-Z0-9_]+-\d+(\s*/\s*[A-Z][A-Z0-9_]+-\d+)*$")
 ISO_DATE_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}$")
 
 # Required fields for sprint section
-REQUIRED_SPRINT_FIELDS = {"number", "jira_sprint_id", "goal", "start_date", "end_date", "status"}
+REQUIRED_SPRINT_FIELDS = {"goal", "start_date", "end_date", "status"}
 
 # Required fields for story
 REQUIRED_STORY_FIELDS = {"id", "title", "status", "points"}
@@ -103,7 +103,7 @@ def validate_sprint(data: dict[str, Any]) -> ValidationResult:
     """Validate sprint-level structure and fields.
 
     Validates:
-    - Required fields present (number, jira_sprint_id, goal, start_date, end_date, status)
+    - Required fields present (goal, start_date, end_date, status)
     - status is valid value (active, closed)
     - dates are ISO format
 
@@ -159,7 +159,7 @@ def validate_story(story: dict[str, Any], epic_id: str, story_index: int = 0) ->
     - Required fields present (id, title, status, points)
     - status is valid value (backlog, ready, in_progress, done, canceled)
     - points is numeric
-    - jira key follows pattern MSSCI-NNNNN if present
+    - jira key follows PROJECT-NUMBER pattern if present
     - branch follows convention if present
 
     Args:
@@ -204,7 +204,7 @@ def validate_story(story: dict[str, Any], epic_id: str, story_index: int = 0) ->
         jira_key = str(story["jira"])
         if not JIRA_KEY_PATTERN.match(jira_key):
             result.add_error(
-                f"Invalid Jira key format '{jira_key}'. Expected MSSCI-NNNNN",
+                f"Invalid Jira key format '{jira_key}'. Expected PROJECT-NUMBER format (e.g., DPGD-17, MSSCI-12345)",
                 f"{base_path}.jira",
             )
 
@@ -286,7 +286,7 @@ def validate_epic_shard(epic: dict[str, Any]) -> ValidationResult:
     - stories is a list
     - Each story has required fields (id, title, points, status)
     - No duplicate story IDs within the epic
-    - jira key follows MSSCI-NNNNN pattern if present
+    - jira key follows PROJECT-NUMBER pattern if present
 
     Args:
         epic: Epic shard dict to validate
@@ -328,7 +328,7 @@ def validate_epic_shard(epic: dict[str, Any]) -> ValidationResult:
         jira_key = str(epic["jira"])
         if not JIRA_KEY_PATTERN.match(jira_key):
             result.add_error(
-                f"Invalid Jira key format '{jira_key}'. Expected MSSCI-NNNNN",
+                f"Invalid Jira key format '{jira_key}'. Expected PROJECT-NUMBER format (e.g., DPGD-17, MSSCI-12345)",
                 "epic.jira",
             )
 

package/pennyfarthing-dist/pf/tests/test_sprint_validator.py

@@ -288,6 +288,50 @@ class TestStoryValidation:
 
         assert result.valid is True
 
+    def test_short_project_key_passes(self) -> None:
+        """Short project key with fewer digits should pass (e.g., DPGD-17)."""
+        story = {
+            "id": "63-1",
+            "title": "Test",
+            "status": "backlog",
+            "points": 3,
+            "jira": "DPGD-17",
+        }
+
+        result = validate_story(story, "epic-63")
+
+        assert result.valid is True
+
+    def test_compound_jira_key_passes(self) -> None:
+        """Compound Jira key with slash separator should pass (e.g., DPGD-10 / DPGD-17)."""
+        story = {
+            "id": "63-1",
+            "title": "Test",
+            "status": "backlog",
+            "points": 3,
+            "jira": "DPGD-10 / DPGD-17",
+        }
+
+        result = validate_story(story, "epic-63")
+
+        assert result.valid is True
+
+    def test_sprint_without_number_and_jira_sprint_id_passes(self) -> None:
+        """Sprint without number and jira_sprint_id should pass (BMAD-imported sprints)."""
+        data = {
+            "sprint": {
+                "goal": "BMAD imported sprint",
+                "start_date": "2026-01-20",
+                "end_date": "2026-02-02",
+                "status": "active",
+            },
+            "epics": [],
+        }
+
+        result = validate_sprint(data)
+
+        assert result.valid is True
+
     def test_error_path_includes_epic_context(self) -> None:
         """Error path should include epic ID for context."""
         story = {"id": "63-1", "title": "Test", "points": 3}  # Missing status

package/pennyfarthing-dist/scripts/lib/find-root.sh

@@ -28,7 +28,7 @@ if [[ -n "$_caller_script" ]]; then
         _pkg="${_pkg%/pennyfarthing-dist}"
         _pkg="${_pkg%/.pennyfarthing}"
         if [[ "$_pkg" == */node_modules/* ]]; then
-            PROJECT_ROOT="${_pkg%/node_modules/*}"
+            PROJECT_ROOT="${_pkg%%/node_modules/*}"
         elif [[ -d "$_pkg/.pennyfarthing" ]]; then
             PROJECT_ROOT="$_pkg"
         elif [[ -d "$_pkg/../.pennyfarthing" ]]; then

package/pennyfarthing-dist/scripts/misc/migrate_bmad_workflow.py

@@ -14,7 +14,6 @@ Usage: python migrate_bmad_workflow.py [--dry-run] <source-dir> [target-dir]
 
 import argparse
 import re
-import shutil
 import sys
 from pathlib import Path