@pennyfarthing/core 10.0.5 → 10.2.0

package/pennyfarthing_scripts/sprint/work.py

@@ -7,11 +7,8 @@ Provides functions for starting and managing work on stories.
 from typing import Any
 
 from pennyfarthing_scripts.sprint.loader import (
-    find_epic,
-    find_story,
     get_stories_by_status,
     get_story_by_id,
-    load_sprint,
 )
 
 
@@ -35,6 +32,20 @@ def check_story(story_id: str) -> dict[str, Any]:
     status = story.get("status", "backlog")
     assigned = story.get("assigned_to")
 
+    # Check if assigned to someone else
+    if assigned:
+        from pennyfarthing_scripts.jira.client import get_current_user_email
+
+        current_user = get_current_user_email()
+        if assigned != current_user:
+            return {
+                "available": False,
+                "type": "story",
+                "story": story,
+                "reason": f"Assigned to {assigned}",
+                "assigned_to": assigned,
+            }
+
     # Check if already in progress
     if status == "in_progress":
         return {
@@ -78,15 +89,22 @@ def get_next_story() -> dict[str, Any]:
     """Get the highest priority available story.
 
     Considers stories with backlog, ready, or planning status.
+    Excludes stories assigned to other users.
 
     Returns:
         Dict with next story details or error
     """
+    from pennyfarthing_scripts.jira.client import get_current_user_email
     from pennyfarthing_scripts.sprint.loader import get_all_stories
 
+    current_user = get_current_user_email()
     all_stories = get_all_stories()
     available_statuses = {"backlog", "ready", "planning"}
-    backlog = [s for s in all_stories if s.get("status") in available_statuses]
+    backlog = [
+        s for s in all_stories
+        if s.get("status") in available_statuses
+        and (not s.get("assigned_to") or s.get("assigned_to") == current_user)
+    ]
 
     if not backlog:
         return {
@@ -94,11 +112,14 @@ def get_next_story() -> dict[str, Any]:
             "error": "No stories in backlog",
         }
 
-    # Sort by priority (P0 > P1 > P2 > P3)
+    # Sort by priority (P0 > P1 > P2 > P3), preferring own assignments
     priority_order = {"P0": 0, "P1": 1, "P2": 2, "P3": 3}
     sorted_stories = sorted(
         backlog,
-        key=lambda s: priority_order.get(s.get("priority", "P2"), 2),
+        key=lambda s: (
+            0 if s.get("assigned_to") == current_user else 1,
+            priority_order.get(s.get("priority", "P2"), 2),
+        ),
     )
 
     next_story = sorted_stories[0]
@@ -196,7 +217,7 @@ def main(args: list[str] | None = None) -> int:
         print(f"Story: {story.get('id')}")
         print(f"Title: {story.get('title')}")
         print(f"Points: {story.get('points')}")
-        print(f"Status: Available")
+        print("Status: Available")
         return 0
     else:
         print(f"Not available: {result.get('error') or result.get('reason')}", file=sys.stderr)

package/pennyfarthing_scripts/sprint/yaml_io.py

@@ -272,7 +272,9 @@ def canonical_dump(data: Any) -> str:
 def _get_epic_ref(epic: Mapping) -> str:
     """Get the canonical reference ID for an epic shard file.
 
-    Mirrors the logic in migrate-to-shards.py: prefer Jira key, fall back to ID.
+    Priority: Jira key > numeric ID extracted from epic-N > raw ID.
+    Strips 'epic-' prefix from IDs to prevent double-prefix filenames
+    (e.g., epic-epic-94.yaml). See ADR-0022.
     """
     jira = epic.get("jira")
     epic_id = str(epic.get("id", ""))
@@ -281,7 +283,13 @@ def _get_epic_ref(epic: Mapping) -> str:
         return str(jira)
     if JIRA_PATTERN.match(epic_id):
         return epic_id
-    return epic_id
+
+    # Strip epic- prefix to prevent double-prefix filenames
+    # e.g., "epic-94" -> "94" so file becomes "epic-94.yaml" not "epic-epic-94.yaml"
+    stripped = epic_id
+    while stripped.startswith("epic-"):
+        stripped = stripped[5:]
+    return stripped or epic_id
 
 
 def _write_yaml_file(path: Path, data: Any) -> None:

package/pennyfarthing_scripts/story/__init__.py

@@ -15,6 +15,20 @@ Usage:
 """
 
 # Re-export common functions
+# Import submodules
+# CLI entry point - import module, not function, so "from story import cli" gets the module
+from pennyfarthing_scripts.story import (
+    cli,
+    create,
+    size,
+    template,
+)
+from pennyfarthing_scripts.story.cli import main
+from pennyfarthing_scripts.story.create import (
+    create_story,
+    generate_story_yaml,
+    validate_points,
+)
 from pennyfarthing_scripts.story.size import (
     SIZING_GUIDELINES,
     format_size_info,
@@ -26,22 +40,6 @@ from pennyfarthing_scripts.story.template import (
     get_all_templates,
     get_template,
 )
-from pennyfarthing_scripts.story.create import (
-    create_story,
-    generate_story_yaml,
-    validate_points,
-)
-
-# Import submodules
-from pennyfarthing_scripts.story import (
-    create,
-    size,
-    template,
-)
-
-# CLI entry point - import module, not function, so "from story import cli" gets the module
-from pennyfarthing_scripts.story import cli
-from pennyfarthing_scripts.story.cli import main
 
 __all__ = [
     # Size

package/pennyfarthing_scripts/story/size.py

@@ -6,7 +6,6 @@ Provides guidelines and helpers for sizing stories.
 
 from typing import Any
 
-
 # Sizing guidelines
 SIZING_GUIDELINES = {
     1: {

package/pennyfarthing_scripts/story/template.py

@@ -6,7 +6,6 @@ Provides templates for different story types.
 
 from typing import Any
 
-
 # Story templates
 TEMPLATES = {
     "feature": {

package/pennyfarthing_scripts/swebench.py

@@ -19,7 +19,6 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
-
 # Default cache location for SWE-bench data
 DEFAULT_CACHE_PATH = "/tmp/swebench_all.json"
 
@@ -108,7 +107,7 @@ def load_swebench_data(cache_path: str | Path = DEFAULT_CACHE_PATH) -> list[dict
         FileNotFoundError: If cache file doesn't exist
         json.JSONDecodeError: If cache file is invalid JSON
     """
-    with open(cache_path, "r") as f:
+    with open(cache_path) as f:
         return json.load(f)
 
 

package/pennyfarthing_scripts/tests/conftest.py

@@ -3,10 +3,9 @@
 Story 63-9: Reorganize pennyfarthing_scripts into fan-out CLI pattern.
 """
 
-import os
 import sys
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
 
 import pytest
 

package/pennyfarthing_scripts/tests/test_brownfield.py

@@ -12,37 +12,34 @@ Tests verify:
 7. CLI integration
 """
 
-import asyncio
 import subprocess
 import sys
 import tempfile
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
-from unittest.mock import MagicMock, patch
 
 import pytest
 
 from pennyfarthing_scripts.brownfield import (
     DepthLevel,
-    ProjectType,
     DiscoveryResult,
+    ProjectType,
+    detect_architecture_patterns,
     detect_project_type,
     detect_tech_stack,
-    scan_directory_structure,
-    detect_architecture_patterns,
+    discover,
+    generate_ai_guidance_doc,
     generate_project_overview,
-    generate_tech_stack_doc,
     generate_source_tree_doc,
-    generate_ai_guidance_doc,
-    discover,
+    generate_tech_stack_doc,
+    scan_directory_structure,
 )
 from pennyfarthing_scripts.brownfield.discover import (
-    TechStackItem,
-    DirectoryNode,
     ArchitecturePattern,
+    DirectoryNode,
+    TechStackItem,
 )
 
-
 # =============================================================================
 # FIXTURES
 # =============================================================================
@@ -623,7 +620,7 @@ class TestDiscover:
         output_dir = temp_project_dir / "output"
         output_dir.mkdir()
 
-        result = await discover(node_project, output_dir=output_dir, depth=DepthLevel.DEEP)
+        await discover(node_project, output_dir=output_dir, depth=DepthLevel.DEEP)
 
         expected_files = [
             "project-overview.md",

package/pennyfarthing_scripts/tests/test_cli_modules.py

@@ -8,10 +8,6 @@ properly delegate to library modules.
 
 import subprocess
 import sys
-from typing import Any
-from unittest.mock import MagicMock, patch
-
-import pytest
 
 
 class TestJiraCLIModule: