@pennyfarthing/core 10.0.5 → 10.2.0

package/pennyfarthing_scripts/jira/bidirectional.py

@@ -28,11 +28,10 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Literal
 
-from pennyfarthing_scripts.jira.client import JiraClient, map_jira_to_status, map_status_to_jira
 from pennyfarthing_scripts.common.output import error, info, success, warn
+from pennyfarthing_scripts.jira.client import JiraClient, map_jira_to_status, map_status_to_jira
 from pennyfarthing_scripts.sprint.loader import get_all_stories, load_sprint
 
-
 # =============================================================================
 # Data Classes
 # =============================================================================
@@ -43,7 +42,7 @@ class SyncChange:
     """Represents a single sync change to apply."""
 
     key: str
-    field: Literal["status", "points"]
+    field: Literal["status", "points", "assigned_to"]
     action: Literal["update-yaml", "update-jira"]
     yaml_value: Any
     jira_value: Any
@@ -123,10 +122,15 @@ Examples:
         action="store_true",
         help="Sync story points",
     )
+    parser.add_argument(
+        "--assignee",
+        action="store_true",
+        help="Sync assignee field (Jira -> YAML only)",
+    )
     parser.add_argument(
         "--all",
         action="store_true",
-        help="Sync all fields (status + points)",
+        help="Sync all fields (status + points + assignee)",
     )
     parser.add_argument(
         "--sprint",
@@ -137,10 +141,11 @@ Examples:
 
     args = parser.parse_args(argv)
 
-    # --all implies both --status and --points
+    # --all implies --status, --points, and --assignee
     if args.all:
         args.status = True
         args.points = True
+        args.assignee = True
 
     return args
 
@@ -156,6 +161,7 @@ def generate_sync_plan(
     *,
     sync_status: bool = False,
     sync_points: bool = False,
+    sync_assignee: bool = False,
     yaml_wins: bool = False,
 ) -> SyncPlan:
     """Generate a sync plan comparing YAML and Jira stories.
@@ -165,6 +171,7 @@ def generate_sync_plan(
         jira_stories: Stories from Jira [{key, fields: {status: {name}, customfield_10031, ...}}]
         sync_status: Whether to sync status field
         sync_points: Whether to sync points field
+        sync_assignee: Whether to sync assignee field (always Jira -> YAML)
         yaml_wins: If True, YAML wins conflicts (default: Jira wins)
 
     Returns:
@@ -248,6 +255,26 @@ def generate_sync_plan(
                 )
             )
 
+        # Check assignee differences (always Jira -> YAML, ignores yaml_wins)
+        if sync_assignee:
+            yaml_assignee = yaml_story.get("assigned_to")
+            jira_assignee_obj = jira_story.get("fields", {}).get("assignee")
+            jira_assignee_email = (
+                jira_assignee_obj.get("emailAddress") if jira_assignee_obj else None
+            )
+
+            if yaml_assignee != jira_assignee_email:
+                plan.changes.append(
+                    SyncChange(
+                        key=key,
+                        field="assigned_to",
+                        action="update-yaml",
+                        yaml_value=yaml_assignee,
+                        jira_value=jira_assignee_email,
+                        target_value=jira_assignee_email,
+                    )
+                )
+
     return plan
 
 
@@ -326,21 +353,17 @@ async def execute_sync_plan(
 
     # Execute YAML updates (sequential, file-based)
     if yaml_updates:
-        # Load current sprint data
         from pennyfarthing_scripts.common.config import get_project_root
+        from pennyfarthing_scripts.sprint.yaml_io import read_sprint, write_sprint
 
         root = get_project_root()
         sprint_file = sprint_path or (root / "sprint" / "current-sprint.yaml")
 
         if sprint_file.exists():
-            import yaml
-
-            with open(sprint_file) as f:
-                sprint_data = yaml.safe_load(f)
+            sprint_data = read_sprint(sprint_file)
 
             # Apply YAML updates
             for change in yaml_updates:
-                # Find and update the story in sprint data
                 updated = _update_story_in_sprint(
                     sprint_data, change.key, change.field, change.target_value
                 )
@@ -348,10 +371,9 @@ async def execute_sync_plan(
                     result.changes_applied += 1
                     result.yaml_modified = True
 
-            # Write back if modified
+            # Write back if modified (handles shards automatically)
             if result.yaml_modified:
-                with open(sprint_file, "w") as f:
-                    yaml.dump(sprint_data, f, default_flow_style=False, sort_keys=False)
+                write_sprint(sprint_file, sprint_data)
 
     return result
 
@@ -379,7 +401,10 @@ def _update_story_in_sprint(
     for epic in sprint_data.get("epics", []):
         for story in epic.get("stories", []):
             if story.get("jira") == jira_key:
-                story[field] = value
+                if value is None and field in story:
+                    del story[field]
+                elif value is not None:
+                    story[field] = value
                 return True
 
     return False
@@ -465,8 +490,8 @@ async def async_main(args: argparse.Namespace) -> int:
         Exit code (0 for success, 1 for error)
     """
     # Validate at least one field is selected
-    if not args.status and not args.points:
-        error("Must specify at least one field to sync: --status, --points, or --all")
+    if not args.status and not args.points and not args.assignee:
+        error("Must specify at least one field to sync: --status, --points, --assignee, or --all")
         return 1
 
     # Load sprint data
@@ -494,7 +519,7 @@ async def async_main(args: argparse.Namespace) -> int:
     tasks = [client.get_issue_async(key) for key in jira_keys]
     results = await asyncio.gather(*tasks, return_exceptions=True)
 
-    for key, result in zip(jira_keys, results):
+    for key, result in zip(jira_keys, results, strict=False):
         if isinstance(result, Exception):
             warn(f"Failed to fetch {key}: {result}")
         elif result:
@@ -510,6 +535,7 @@ async def async_main(args: argparse.Namespace) -> int:
         jira_stories,
         sync_status=args.status,
         sync_points=args.points,
+        sync_assignee=args.assignee,
         yaml_wins=args.yaml_wins,
     )
 

package/pennyfarthing_scripts/jira/claim.py

@@ -162,6 +162,27 @@ def claim_story(issue_key: str) -> dict[str, Any]:
             "exit_code": 3,
         }
 
+    # Update sprint YAML assigned_to field
+    try:
+        from pennyfarthing_scripts.common.config import get_project_root
+        from pennyfarthing_scripts.sprint.yaml_io import read_sprint, write_sprint
+
+        root = get_project_root()
+        sprint_path = root / "sprint" / "current-sprint.yaml"
+        if sprint_path.exists():
+            data = read_sprint(sprint_path)
+            for epic in data.get("epics", []):
+                if not isinstance(epic, dict):
+                    continue
+                for story in epic.get("stories", []):
+                    if story.get("jira") == issue_key:
+                        story["assigned_to"] = current_user
+                        write_sprint(sprint_path, data)
+                        actions.append("Sprint YAML assigned_to set")
+                        break
+    except Exception:
+        pass  # Best-effort — Jira claim already succeeded
+
     return {
         "success": True,
         "actions": actions,

package/pennyfarthing_scripts/jira/cli.py

@@ -206,7 +206,7 @@ def create_standalone(title, points, description, dry_run):
         click.echo(f"[DRY-RUN] Would create: {title}")
         click.echo(f"  Points: {points}")
         click.echo(f"  Sprint: {sprint_id}")
-        click.echo(f"  Actions: create -> add to sprint -> transition to Done")
+        click.echo("  Actions: create -> add to sprint -> transition to Done")
         return
 
     client = get_client()
@@ -241,7 +241,7 @@ def create_standalone(title, points, description, dry_run):
     # 4. Transition to Done
     result = client.transition_sync(jira_key, "Done")
     if result.get("success"):
-        click.echo(f"Transitioned to Done")
+        click.echo("Transitioned to Done")
     else:
         click.echo(f"Warning: could not transition to Done: {result.get('reason')}")
 
@@ -274,9 +274,10 @@ def sync(epic, dry_run, transition, points, sync_all):
 @click.option("--yaml-wins", is_flag=True, help="Prefer YAML values on conflict")
 @click.option("--status", is_flag=True, help="Sync status field")
 @click.option("--points", is_flag=True, help="Sync story points")
+@click.option("--assignee", is_flag=True, help="Sync assignee field (Jira -> YAML only)")
 @click.option("--all", "sync_all", is_flag=True, help="Sync all fields")
 @click.option("--sprint", "sprint_id", help="Target specific sprint")
-def bidirectional(dry_run, yaml_wins, status, points, sync_all, sprint_id):
+def bidirectional(dry_run, yaml_wins, status, points, assignee, sync_all, sprint_id):
     """Bidirectional sync between YAML and Jira."""
     from pennyfarthing_scripts.jira.bidirectional import main as bidirectional_main
 
@@ -289,6 +290,8 @@ def bidirectional(dry_run, yaml_wins, status, points, sync_all, sprint_id):
         args.append("--status")
     if points or sync_all:
         args.append("--points")
+    if assignee or sync_all:
+        args.append("--assignee")
     if sync_all:
         args.append("--all")
     if sprint_id:

package/pennyfarthing_scripts/jira/client.py

@@ -301,6 +301,34 @@ def map_github_to_jira(github_user: str | None) -> str | None:
     return GITHUB_TO_JIRA_MAP.get(github_user, f"{github_user}@1898andco.io")
 
 
+def get_current_user_email() -> str:
+    """Get the current user's Jira email address.
+
+    Resolution order:
+    1. JIRA_USER environment variable
+    2. git config user.email
+    3. Default fallback
+
+    Returns:
+        Email address string
+    """
+    jira_user = os.environ.get("JIRA_USER")
+    if jira_user:
+        return jira_user
+
+    try:
+        result = subprocess.run(
+            ["git", "config", "user.email"],
+            capture_output=True, text=True, timeout=5,
+        )
+        if result.returncode == 0 and result.stdout.strip():
+            return result.stdout.strip()
+    except Exception:
+        pass
+
+    return "keith.avery@1898andco.io"
+
+
 # =============================================================================
 # JiraClient - Unified REST API client
 # =============================================================================
@@ -487,7 +515,7 @@ class JiraClient:
                 f"Available: {available}",
             }
 
-        result = self._call_api_sync(
+        self._call_api_sync(
             "POST",
             f"/rest/api/3/issue/{issue_key}/transitions",
             {"transition": {"id": transition_id}},
@@ -525,7 +553,7 @@ class JiraClient:
             account_id = None
 
         payload = {"accountId": account_id}
-        result = self._call_api_sync(
+        self._call_api_sync(
             "PUT", f"/rest/api/3/issue/{issue_key}/assignee", payload
         )
         # Assign PUT returns empty body on success (204)
@@ -541,7 +569,7 @@ class JiraClient:
         Returns:
             Result dict with success status
         """
-        result = self._call_api_sync(
+        self._call_api_sync(
             "POST",
             f"/rest/agile/1.0/sprint/{sprint_id}/issue",
             {"issues": [issue_key]},
@@ -591,7 +619,7 @@ class JiraClient:
         Returns:
             Result dict with success status
         """
-        result = self._call_api_sync(
+        self._call_api_sync(
             "POST",
             "/rest/api/3/issueLink",
             {

package/pennyfarthing_scripts/jira/create.py

@@ -16,7 +16,7 @@ import sys
 from pathlib import Path
 from typing import Any
 
-from pennyfarthing_scripts.jira.client import JIRA_PROJECT, JiraClient, get_client
+from pennyfarthing_scripts.jira.client import JIRA_PROJECT, get_client
 from pennyfarthing_scripts.sprint.loader import find_epic, find_story, load_sprint
 from pennyfarthing_scripts.sprint.yaml_io import read_sprint, write_sprint
 
@@ -150,6 +150,7 @@ def create_epic_in_jira(
     *,
     sprint_path: Path | None = None,
     dry_run: bool = False,
+    force: bool = False,
 ) -> dict[str, Any]:
     """Create a Jira epic and its child stories from sprint YAML.
 
@@ -157,6 +158,7 @@ def create_epic_in_jira(
         epic_id: Epic ID from sprint YAML (e.g., "epic-63" or "63")
         sprint_path: Path to sprint YAML (defaults to auto-detect)
         dry_run: If True, preview without creating
+        force: If True, create even if duplicate title detected
 
     Returns:
         {success, epic_key?, stories: [{id, jira_key}], error?}
@@ -184,6 +186,13 @@ def create_epic_in_jira(
     if not epic_ruamel:
         return {"success": False, "error": f"Epic '{epic_id}' not found in ruamel data"}
 
+    # Validate epic shard before any Jira operations (ADR-0022)
+    from pennyfarthing_scripts.sprint.validator import validate_epic_shard
+    validation = validate_epic_shard(dict(epic_ruamel))
+    if not validation.valid:
+        error_msgs = "; ".join(e.message for e in validation.errors)
+        return {"success": False, "error": f"Epic validation failed: {error_msgs}"}
+
     title = epic.get("title", f"Epic {epic_id}")
     description = epic.get("description", "")
     epic_jira_key = epic.get("jira")
@@ -200,6 +209,41 @@ def create_epic_in_jira(
             epic_jira_key = "MSSCI-XXXXX"
         else:
             client = get_client()
+
+            # Idempotency check: search for existing epic with same title (ADR-0022)
+            try:
+                existing = client.search_issues_sync(
+                    f'project = {JIRA_PROJECT} AND issuetype = Epic AND summary ~ "{title}"'
+                )
+                if existing and not force:
+                    existing_key = existing[0]["key"]
+                    print(f"Found existing epic with same title: {existing_key}")
+                    epic_jira_key = existing_key
+
+                    # Update YAML with existing key
+                    epic_ruamel["jira"] = epic_jira_key
+                    write_sprint(path, data)
+
+                    return {
+                        "success": True,
+                        "epic_key": epic_jira_key,
+                        "duplicate_detected": True,
+                        "stories": [],
+                    }
+                elif existing and force:
+                    import warnings
+                    warnings.warn(
+                        f"Duplicate epic title detected ({existing[0]['key']}), "
+                        "proceeding with --force",
+                        stacklevel=2,
+                    )
+            except Exception as exc:
+                import warnings
+                warnings.warn(
+                    f"Jira search for duplicate titles failed: {exc}",
+                    stacklevel=2,
+                )
+
             payload = {
                 "fields": {
                     "project": {"key": JIRA_PROJECT},

package/pennyfarthing_scripts/jira/epic.py

@@ -17,8 +17,9 @@ import json
 import sys
 from typing import Any
 
-from pennyfarthing_scripts.jira.client import JiraClient, JIRA_PROJECT
-from pennyfarthing_scripts.sprint.loader import find_epic, load_sprint as load_current_sprint
+from pennyfarthing_scripts.jira.client import JIRA_PROJECT, JiraClient
+from pennyfarthing_scripts.sprint.loader import find_epic
+from pennyfarthing_scripts.sprint.loader import load_sprint as load_current_sprint
 
 
 def parse_args(args: list[str] | None = None) -> argparse.Namespace:

package/pennyfarthing_scripts/jira/reconcile.py

@@ -23,7 +23,6 @@ from pennyfarthing_scripts.jira.client import (
     JIRA_PROJECT,
     get_client,
     get_jira_field,
-    map_jira_to_status,
     map_status_to_jira,
 )
 from pennyfarthing_scripts.sprint.loader import load_sprint

package/pennyfarthing_scripts/jira/story.py

@@ -24,6 +24,8 @@ from pennyfarthing_scripts.sprint.loader import (
     find_epic,
     find_story,
     get_story_by_id,
+)
+from pennyfarthing_scripts.sprint.loader import (
     load_sprint as load_current_sprint,
 )
 

package/pennyfarthing_scripts/jira/sync.py

@@ -17,13 +17,13 @@ from dataclasses import dataclass, field
 from typing import Any
 
 from pennyfarthing_scripts.common.config import get_project_root
+from pennyfarthing_scripts.common.output import error, info, success, warn
 from pennyfarthing_scripts.jira.client import (
     JiraClient,
     extract_jira_key,
     get_jira_field,
     map_status_to_jira,
 )
-from pennyfarthing_scripts.common.output import error, info, success, warn
 from pennyfarthing_scripts.sprint.loader import find_epic, load_sprint
 
 

package/pennyfarthing_scripts/migration/skill.py

@@ -10,7 +10,6 @@ import re
 from dataclasses import dataclass, field
 from pathlib import Path
 
-
 # Tag requirements
 REQUIRED_TAGS = ["run", "output"]
 RECOMMENDED_TAGS = ["args", "example", "when"]

package/pennyfarthing_scripts/migration/step.py

@@ -10,7 +10,6 @@ import re
 from dataclasses import dataclass, field
 from pathlib import Path
 
-
 # Tag requirements
 REQUIRED_TAGS = ["step-meta", "purpose", "instructions", "output"]
 RECOMMENDED_TAGS = ["prerequisites", "actions", "collaboration-menu", "next-step"]

package/pennyfarthing_scripts/migration/validate.py

@@ -20,12 +20,20 @@ from pennyfarthing_scripts.migration.session import (
 )
 from pennyfarthing_scripts.migration.skill import (
     RECOMMENDED_TAGS as SKILL_RECOMMENDED,
+)
+from pennyfarthing_scripts.migration.skill import (
     REQUIRED_TAGS as SKILL_REQUIRED,
+)
+from pennyfarthing_scripts.migration.skill import (
     find_skill_files,
 )
 from pennyfarthing_scripts.migration.step import (
     RECOMMENDED_TAGS as STEP_RECOMMENDED,
+)
+from pennyfarthing_scripts.migration.step import (
     REQUIRED_TAGS as STEP_REQUIRED,
+)
+from pennyfarthing_scripts.migration.step import (
     STEP_META_FIELDS,
     find_step_files,
 )
@@ -119,7 +127,6 @@ def validate_skill_file(file_path: Path) -> ValidationResult:
     Returns:
         ValidationResult with errors/warnings
     """
-    skill_name = file_path.parent.name
     result = ValidationResult(file_path=file_path, file_type="skill")
     content = file_path.read_text()
 
@@ -157,10 +164,6 @@ def validate_step_file(file_path: Path) -> ValidationResult:
     result = ValidationResult(file_path=file_path, file_type="step")
     content = file_path.read_text()
 
-    # Determine workflow/step names from path
-    workflow_name = file_path.parent.parent.name
-    step_name = file_path.stem
-
     # Check required tags
     for tag in STEP_REQUIRED:
         if not _has_tag(content, tag):

package/pennyfarthing_scripts/patch_mode.py

@@ -13,7 +13,7 @@ from __future__ import annotations
 import re
 import subprocess
 import time
-from dataclasses import dataclass, asdict
+from dataclasses import asdict, dataclass
 from datetime import datetime
 from pathlib import Path
 from typing import Any
@@ -38,7 +38,7 @@ class PatchState:
         return yaml.dump(asdict(self), default_flow_style=False)
 
     @classmethod
-    def from_yaml(cls, yaml_str: str) -> "PatchState":
+    def from_yaml(cls, yaml_str: str) -> PatchState:
         """Deserialize state from YAML string."""
         data = yaml.safe_load(yaml_str)
         return cls(**data)

package/pennyfarthing_scripts/preflight/__init__.py

@@ -5,8 +5,8 @@ to validate story completion before finishing.
 """
 
 from pennyfarthing_scripts.preflight.finish import (
-    PreflightResult,
     PreflightIssue,
+    PreflightResult,
     run_finish_preflight,
 )
 

package/pennyfarthing_scripts/preflight/finish.py

@@ -8,7 +8,6 @@ concurrent execution regardless of model behavior.
 import asyncio
 import json
 import re
-import sys
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any

package/pennyfarthing_scripts/pretooluse_hook.py

@@ -40,15 +40,14 @@ from pathlib import Path
 sys.path.insert(0, str(Path(__file__).parent))
 
 from hooks import (
-    find_project_root,
-    get_cyclist_port,
-    send_to_cyclist,
-    read_stdin_json,
-    output_hook_response,
     HookResponse,
-    load_settings,
-    is_cyclist_running,
+    find_project_root,
     get_context_state,
+    is_cyclist_running,
+    load_settings,
+    output_hook_response,
+    read_stdin_json,
+    send_to_cyclist,
 )
 
 

package/pennyfarthing_scripts/prime/cli.py

@@ -22,6 +22,10 @@ import argparse
 import json
 import sys
 from pathlib import Path
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Any
 
 from pennyfarthing_scripts.common.config import get_project_root
 from pennyfarthing_scripts.prime.loader import (
@@ -42,7 +46,7 @@ from pennyfarthing_scripts.prime.persona import (
     load_persona,
 )
 from pennyfarthing_scripts.prime.session import cleanup_old_sessions, register_session
-from pennyfarthing_scripts.prime.tiers import ContextTier, tier_from_string, load_tier_components
+from pennyfarthing_scripts.prime.tiers import ContextTier, load_tier_components, tier_from_string
 from pennyfarthing_scripts.prime.workflow import check_redirect, detect_workflow_state
 
 

package/pennyfarthing_scripts/prime/loader.py

@@ -14,7 +14,6 @@ from __future__ import annotations
 
 import re
 from pathlib import Path
-from typing import Any
 
 from pennyfarthing_scripts.common.config import get_project_root
 
@@ -68,7 +67,7 @@ def load_sprint_context(project_root: Path | None = None) -> str | None:
         Formatted sprint summary, or None if no sprint data
     """
     # Import here to avoid circular imports
-    from pennyfarthing_scripts.sprint.loader import load_sprint, get_sprint_info
+    from pennyfarthing_scripts.sprint.loader import load_sprint
     from pennyfarthing_scripts.sprint.status import get_sprint_status
 
     root = project_root or get_project_root()
@@ -136,7 +135,7 @@ def _extract_session_parts(content: str) -> tuple[str, str]:
 
     # Header: everything before first ## heading
     header_lines = []
-    for i, line in enumerate(lines):
+    for line in lines:
         if line.startswith("## "):
             break
         header_lines.append(line)

package/pennyfarthing_scripts/prime/persona.py

@@ -14,11 +14,12 @@ import yaml
 from pennyfarthing_scripts.common.config import get_project_root, load_yaml_config
 from pennyfarthing_scripts.common.themes import (
     get_current_theme as _get_current_theme,
+)
+from pennyfarthing_scripts.common.themes import (
     resolve_theme_path,
 )
 from pennyfarthing_scripts.prime.models import CrewMember, Persona
 
-
 # Standard agent roles for crew manifest
 AGENT_ROLES = [
     "sm", "tea", "dev", "reviewer", "architect",