@pennyfarthing/core 11.1.0 → 11.2.0

package/pennyfarthing_scripts/sprint/loader.py

@@ -62,6 +62,17 @@ def _merge_epic_shards(data: dict[str, Any], sprint_dir: Path) -> dict[str, Any]
                 stacklevel=2,
             )
 
+    # Collect epic refs owned by initiatives so we don't warn about them.
+    initiative_refs: set[str] = set()
+    for init_file in sorted(sprint_dir.glob("initiative-*.yaml")):
+        init_data = load_yaml_config(init_file)
+        if init_data and isinstance(init_data, dict):
+            for ref in init_data.get("epics", []):
+                if isinstance(ref, str):
+                    initiative_refs.add(ref)
+                    # Also add normalized form (strip "epic-" prefix)
+                    initiative_refs.add(ref.replace("epic-", ""))
+
     # Log unindexed shard files on disk (but do NOT auto-merge —
     # orphan shards may belong to future initiatives).
     for shard_file in sorted(sprint_dir.glob("epic-*.yaml")):
@@ -74,7 +85,10 @@ def _merge_epic_shards(data: dict[str, Any], sprint_dir: Path) -> dict[str, Any]
         jira_key = str(epic_data.get("jira", ""))
         if eid in loaded_epic_ids or (jira_key and jira_key in loaded_epic_ids):
             continue
-        # Warn but don't merge
+        # Skip shards owned by initiatives (not orphans)
+        if eid in initiative_refs or jira_key in initiative_refs:
+            continue
+        # Warn only about truly orphaned shards
         warnings.warn(
             f"Unindexed shard {shard_file.name} (epic {eid}) not in epics list — skipping",
             stacklevel=2,

package/pennyfarthing_scripts/sprint/story_finish.py

@@ -126,8 +126,16 @@ def finish_story(
     steps: list[dict[str, Any]] = []
     archive_name = f"{jira_key}-session.md" if jira_key else f"{story_id}-session.md"
 
+    # Check for dialogue file
+    dialogue_path = project_root / ".session" / f"{story_id}-dialogue.md"
+    dialogue_archive_name = (
+        f"{jira_key}-dialogue.md" if jira_key else f"{story_id}-dialogue.md"
+    )
+
     if dry_run:
         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:
             steps.append({"step": 2, "action": f"Merge PR #{pr_number} (squash, delete branch)"})
         else:
@@ -147,6 +155,12 @@ def finish_story(
     shutil.copy2(session_path, archive_dest)
     steps.append({"step": 1, "action": "archive_session", "dest": str(archive_dest)})
 
+    # --- Step 1b: Archive dialogue (if exists) ---
+    if dialogue_path.exists():
+        dialogue_dest = archive_dir / dialogue_archive_name
+        shutil.copy2(dialogue_path, dialogue_dest)
+        steps.append({"step": "1b", "action": "archive_dialogue", "dest": str(dialogue_dest)})
+
     # --- Step 2: Merge PR ---
     if pr_number:
         result = _run(["gh", "pr", "merge", pr_number, "--squash", "--delete-branch"])

package/pennyfarthing_scripts/tests/test_bikerack.py

@@ -5,14 +5,14 @@ Epic: 101 — BikeRack Mode (ADR-0024)
 
 Acceptance Criteria:
 - [AC1]  `pf bikerack start` starts WheelHub background with IS_BIKERACK=1
-- [AC2]  Polls for .bikerack-port file (100ms interval, 5s timeout)
+- [AC2]  Polls for .wheelhub-port file (100ms interval, 5s timeout)
 - [AC3]  Sets exactly 5 OTEL env vars from discovered port (Rule 5)
 - [AC4]  Uses exec (not spawn) for Claude CLI (CE-4)
 - [AC5]  trap EXIT registered before exec to kill WheelHub PID (Rule 8)
-- [AC6]  Writes .bikerack-pid after spawning WheelHub
+- [AC6]  Writes .wheelhub-pid after spawning WheelHub
 - [AC7]  `pf bikerack stop` reads PID, sends SIGTERM, deletes files
 - [AC8]  `pf bikerack status` shows running state (PID, port, uptime)
-- [AC9]  Error if already running (.bikerack-port exists with live PID)
+- [AC9]  Error if already running (.wheelhub-port exists with live PID)
 - [AC10] Exit code 1 if WheelHub fails to start, 2 if already running
 - [AC11] Prints dashboard URL on startup
 - [AC12] `just bikerack` works as alias
@@ -101,7 +101,7 @@ class TestStartWheelHub:
 
 
 # ---------------------------------------------------------------------------
-# AC2: Polls for .bikerack-port file (100ms interval, 5s timeout)
+# AC2: Polls for .wheelhub-port file (100ms interval, 5s timeout)
 # ---------------------------------------------------------------------------
 
 
@@ -110,7 +110,7 @@ class TestPortFilePolling:
 
     def test_returns_port_when_file_exists(self, tmp_path: Path) -> None:
         """poll_for_port_file should return port number from file."""
-        port_file = tmp_path / ".bikerack-port"
+        port_file = tmp_path / ".wheelhub-port"
         port_file.write_text("2898")
 
         result = poll_for_port_file(tmp_path)
@@ -125,7 +125,7 @@ class TestPortFilePolling:
 
     def test_waits_for_file_to_appear(self, tmp_path: Path) -> None:
         """poll_for_port_file should poll until file appears."""
-        port_file = tmp_path / ".bikerack-port"
+        port_file = tmp_path / ".wheelhub-port"
 
         # Simulate file appearing after short delay
         call_count = [0]
@@ -160,7 +160,7 @@ class TestPortFilePolling:
 
     def test_reads_integer_port(self, tmp_path: Path) -> None:
         """poll_for_port_file should parse port as integer."""
-        port_file = tmp_path / ".bikerack-port"
+        port_file = tmp_path / ".wheelhub-port"
         port_file.write_text("3000\n")  # Trailing newline should be handled
 
         result = poll_for_port_file(tmp_path)
@@ -340,8 +340,8 @@ class TestCleanupRegistration:
                 assert kill_args[1] == signal.SIGTERM
 
     def test_cleanup_removes_port_file(self, tmp_path: Path) -> None:
-        """Registered cleanup should delete .bikerack-port file."""
-        port_file = tmp_path / ".bikerack-port"
+        """Registered cleanup should delete .wheelhub-port file."""
+        port_file = tmp_path / ".wheelhub-port"
         port_file.write_text("2898")
 
         cleanup_func = None
@@ -363,11 +363,11 @@ class TestCleanupRegistration:
             except (ProcessLookupError, OSError):
                 pass
 
-        assert not port_file.exists(), ".bikerack-port should be deleted by cleanup"
+        assert not port_file.exists(), ".wheelhub-port should be deleted by cleanup"
 
     def test_cleanup_removes_pid_file(self, tmp_path: Path) -> None:
-        """Registered cleanup should delete .bikerack-pid file."""
-        pid_file = tmp_path / ".bikerack-pid"
+        """Registered cleanup should delete .wheelhub-pid file."""
+        pid_file = tmp_path / ".wheelhub-pid"
         pid_file.write_text("12345")
 
         cleanup_func = None
@@ -389,28 +389,28 @@ class TestCleanupRegistration:
             except (ProcessLookupError, OSError):
                 pass
 
-        assert not pid_file.exists(), ".bikerack-pid should be deleted by cleanup"
+        assert not pid_file.exists(), ".wheelhub-pid should be deleted by cleanup"
 
 
 # ---------------------------------------------------------------------------
-# AC6: Writes .bikerack-pid after spawning WheelHub
+# AC6: Writes .wheelhub-pid after spawning WheelHub
 # ---------------------------------------------------------------------------
 
 
 class TestPidFile:
-    """AC6: write_pid_file writes .bikerack-pid."""
+    """AC6: write_pid_file writes .wheelhub-pid."""
 
     def test_writes_pid_to_file(self, tmp_path: Path) -> None:
         """write_pid_file should write PID as ASCII string."""
         write_pid_file(tmp_path, pid=48291)
 
-        pid_file = tmp_path / ".bikerack-pid"
+        pid_file = tmp_path / ".wheelhub-pid"
         assert pid_file.exists()
         assert pid_file.read_text().strip() == "48291"
 
     def test_read_pid_file_returns_pid(self, tmp_path: Path) -> None:
         """read_pid_file should return PID as integer."""
-        pid_file = tmp_path / ".bikerack-pid"
+        pid_file = tmp_path / ".wheelhub-pid"
         pid_file.write_text("48291")
 
         result = read_pid_file(tmp_path)
@@ -424,12 +424,12 @@ class TestPidFile:
         assert result is None
 
     def test_write_pid_creates_file_in_project_dir(self, tmp_path: Path) -> None:
-        """write_pid_file should create .bikerack-pid in project directory."""
+        """write_pid_file should create .wheelhub-pid in project directory."""
         write_pid_file(tmp_path, pid=99999)
 
-        expected = tmp_path / ".bikerack-pid"
+        expected = tmp_path / ".wheelhub-pid"
         assert expected.exists()
-        assert expected.name == ".bikerack-pid"
+        assert expected.name == ".wheelhub-pid"
 
 
 # ---------------------------------------------------------------------------
@@ -443,8 +443,8 @@ class TestStopBikeRack:
     def test_sends_sigterm_to_pid(self, tmp_path: Path) -> None:
         """stop_bikerack should send SIGTERM to the WheelHub PID."""
         # Setup: create port and pid files
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.os.kill") as mock_kill:
             with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
@@ -453,10 +453,10 @@ class TestStopBikeRack:
                 mock_kill.assert_called_with(12345, signal.SIGTERM)
 
     def test_deletes_port_file(self, tmp_path: Path) -> None:
-        """stop_bikerack should delete .bikerack-port."""
-        port_file = tmp_path / ".bikerack-port"
+        """stop_bikerack should delete .wheelhub-port."""
+        port_file = tmp_path / ".wheelhub-port"
         port_file.write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.os.kill"):
             with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
@@ -465,9 +465,9 @@ class TestStopBikeRack:
         assert not port_file.exists()
 
     def test_deletes_pid_file(self, tmp_path: Path) -> None:
-        """stop_bikerack should delete .bikerack-pid."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        pid_file = tmp_path / ".bikerack-pid"
+        """stop_bikerack should delete .wheelhub-pid."""
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        pid_file = tmp_path / ".wheelhub-pid"
         pid_file.write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.os.kill"):
@@ -478,8 +478,8 @@ class TestStopBikeRack:
 
     def test_returns_success_dict(self, tmp_path: Path) -> None:
         """stop_bikerack should return {success: True, pid: N, message: str}."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.os.kill"):
             with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
@@ -506,8 +506,8 @@ class TestStatus:
 
     def test_returns_running_state(self, tmp_path: Path) -> None:
         """get_status should detect running BikeRack."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
             result = get_status(tmp_path)
@@ -524,8 +524,8 @@ class TestStatus:
 
     def test_includes_dashboard_url(self, tmp_path: Path) -> None:
         """get_status should include dashboard URL when running."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
             result = get_status(tmp_path)
@@ -534,8 +534,8 @@ class TestStatus:
 
     def test_detects_stale_pid(self, tmp_path: Path) -> None:
         """get_status should detect stale PID (file exists, process dead)."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("99999")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("99999")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=False):
             result = get_status(tmp_path)
@@ -544,7 +544,7 @@ class TestStatus:
 
 
 # ---------------------------------------------------------------------------
-# AC9: Error if already running (.bikerack-port exists with live PID)
+# AC9: Error if already running (.wheelhub-port exists with live PID)
 # ---------------------------------------------------------------------------
 
 
@@ -553,8 +553,8 @@ class TestAlreadyRunning:
 
     def test_detects_running_instance(self, tmp_path: Path) -> None:
         """is_already_running should return True when port file + live PID."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
             running, pid, port = is_already_running(tmp_path)
@@ -573,8 +573,8 @@ class TestAlreadyRunning:
 
     def test_not_running_when_stale_pid(self, tmp_path: Path) -> None:
         """is_already_running should return False when PID is dead (stale)."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("99999")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("99999")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=False):
             running, pid, port = is_already_running(tmp_path)
@@ -583,8 +583,8 @@ class TestAlreadyRunning:
 
     def test_cleans_stale_files(self, tmp_path: Path) -> None:
         """is_already_running should clean up stale files when PID is dead."""
-        port_file = tmp_path / ".bikerack-port"
-        pid_file = tmp_path / ".bikerack-pid"
+        port_file = tmp_path / ".wheelhub-port"
+        pid_file = tmp_path / ".wheelhub-pid"
         port_file.write_text("2898")
         pid_file.write_text("99999")
 
@@ -605,8 +605,8 @@ class TestExitCodes:
 
     def test_exit_code_2_when_already_running(self, tmp_path: Path) -> None:
         """Start should raise SystemExit(2) when already running."""
-        (tmp_path / ".bikerack-port").write_text("2898")
-        (tmp_path / ".bikerack-pid").write_text("12345")
+        (tmp_path / ".wheelhub-port").write_text("2898")
+        (tmp_path / ".wheelhub-pid").write_text("12345")
 
         with patch("pennyfarthing_scripts.bikerack.launcher.is_process_alive", return_value=True):
             with patch("pennyfarthing_scripts.bikerack.launcher.is_already_running",
@@ -736,8 +736,8 @@ class TestCleanupFiles:
     """Utility: cleanup_files removes port and PID files."""
 
     def test_removes_port_file(self, tmp_path: Path) -> None:
-        """cleanup_files should remove .bikerack-port."""
-        port_file = tmp_path / ".bikerack-port"
+        """cleanup_files should remove .wheelhub-port."""
+        port_file = tmp_path / ".wheelhub-port"
         port_file.write_text("2898")
 
         cleanup_files(tmp_path)
@@ -745,8 +745,8 @@ class TestCleanupFiles:
         assert not port_file.exists()
 
     def test_removes_pid_file(self, tmp_path: Path) -> None:
-        """cleanup_files should remove .bikerack-pid."""
-        pid_file = tmp_path / ".bikerack-pid"
+        """cleanup_files should remove .wheelhub-pid."""
+        pid_file = tmp_path / ".wheelhub-pid"
         pid_file.write_text("12345")
 
         cleanup_files(tmp_path)
@@ -764,7 +764,7 @@ class TestReadPortFile:
 
     def test_reads_port(self, tmp_path: Path) -> None:
         """read_port_file should return port as integer."""
-        (tmp_path / ".bikerack-port").write_text("2898")
+        (tmp_path / ".wheelhub-port").write_text("2898")
 
         result = read_port_file(tmp_path)
 
@@ -778,7 +778,7 @@ class TestReadPortFile:
 
     def test_handles_trailing_whitespace(self, tmp_path: Path) -> None:
         """read_port_file should handle trailing newlines/spaces."""
-        (tmp_path / ".bikerack-port").write_text("2898\n")
+        (tmp_path / ".wheelhub-port").write_text("2898\n")
 
         result = read_port_file(tmp_path)