@pennyfarthing/core 10.0.3 → 10.1.0

package/pennyfarthing-dist/scripts/tests/test-drift-detection.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # test-drift-detection.sh - Tests for story 8-2: Startup Drift Detection
-# Verifies that workflow-status-check detects and reports drift between
+# Verifies that prime/sprint scripts detect and report drift between
 # merged branches and sprint YAML status
 #
 # RED STATE: These tests will FAIL until Dev implements the feature
@@ -38,7 +38,7 @@ echo "=== Story 8-2: Startup Drift Detection ==="
 echo ""
 
 # ==============================================================================
-# AC1: workflow-status-check detects merged-but-not-closed stories
+# AC1: prime detects merged-but-not-closed stories
 # ==============================================================================
 
 echo "--- AC1: Detects merged-but-not-closed stories ---"
@@ -293,28 +293,9 @@ test_drift_output_format() {
     fi
 }
 
-# Test: workflow-status-check.md references drift detection
-test_workflow_status_check_integration() {
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
-
-    if [[ ! -f "$workflow_file" ]]; then
-        fail "workflow-status-check includes drift detection" "file exists" "workflow-status-check.md not found"
-        return
-    fi
-
-    if grep -qi "drift\|detect_drift" "$workflow_file" 2>/dev/null; then
-        pass "workflow-status-check.md references drift detection"
-    else
-        fail "workflow-status-check includes drift detection" \
-             "drift or detect_drift reference in workflow-status-check.md" \
-             "no drift reference found"
-    fi
-}
-
 # Test: Drift report is user-friendly (mentions "merged" and "status")
 test_drift_report_clarity() {
     local sprint_common="$PROJECT_ROOT/pennyfarthing-dist/scripts/sprint/sprint-common.sh"
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
 
     local found=false
 
@@ -323,11 +304,6 @@ test_drift_report_clarity() {
         found=true
     fi
 
-    # Or check workflow-status-check.md for report format
-    if [[ -f "$workflow_file" ]] && grep -qi "merged.*status\|drift.*report\|drifted stories" "$workflow_file" 2>/dev/null; then
-        found=true
-    fi
-
     if [[ "$found" == "true" ]]; then
         pass "drift report uses clear terminology (merged, drift, status)"
     else
@@ -338,7 +314,6 @@ test_drift_report_clarity() {
 }
 
 test_drift_output_format
-test_workflow_status_check_integration
 test_drift_report_clarity
 
 echo ""
@@ -353,7 +328,6 @@ echo ""
 # Test: reconcile_drift function or auto-reconcile logic exists
 test_reconcile_function_exists() {
     local sprint_common="$PROJECT_ROOT/pennyfarthing-dist/scripts/sprint/sprint-common.sh"
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
 
     local found=false
 
@@ -362,11 +336,6 @@ test_reconcile_function_exists() {
         found=true
     fi
 
-    # Or check workflow-status-check.md for reconcile instructions
-    if [[ -f "$workflow_file" ]] && grep -qi "reconcile\|auto.reconcile\|update.*done" "$workflow_file" 2>/dev/null; then
-        found=true
-    fi
-
     if [[ "$found" == "true" ]]; then
         pass "auto-reconcile functionality exists"
     else
@@ -402,7 +371,6 @@ test_reconcile_uses_update() {
 # Test: Auto-reconcile logs to reconciliation.log
 test_reconcile_logs_event() {
     local sprint_common="$PROJECT_ROOT/pennyfarthing-dist/scripts/sprint/sprint-common.sh"
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
 
     local found=false
 
@@ -411,11 +379,6 @@ test_reconcile_logs_event() {
         found=true
     fi
 
-    # Or check workflow-status-check.md for logging instructions
-    if [[ -f "$workflow_file" ]] && grep -qi "log.*reconcil\|reconciliation.log" "$workflow_file" 2>/dev/null; then
-        found=true
-    fi
-
     if [[ "$found" == "true" ]]; then
         pass "auto-reconcile logs to reconciliation.log"
     else
@@ -425,25 +388,6 @@ test_reconcile_logs_event() {
     fi
 }
 
-# Test: workflow-status-check offers reconcile option to user
-test_offers_reconcile_option() {
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
-
-    if [[ ! -f "$workflow_file" ]]; then
-        fail "offers reconcile option" "file exists" "workflow-status-check.md not found"
-        return
-    fi
-
-    # Check for user prompt or option offering
-    if grep -qiE "auto.reconcile|offer.*reconcile|reconcile.*option|y/n|yes/no" "$workflow_file" 2>/dev/null; then
-        pass "workflow-status-check offers reconcile option to user"
-    else
-        fail "offers reconcile option" \
-             "user prompt for auto-reconcile in workflow-status-check.md" \
-             "reconcile prompt not found"
-    fi
-}
-
 # Test: reconcile_drift transitions Jira to Done
 test_reconcile_transitions_jira() {
     local sprint_common="$PROJECT_ROOT/pennyfarthing-dist/scripts/sprint/sprint-common.sh"
@@ -463,30 +407,10 @@ test_reconcile_transitions_jira() {
     fi
 }
 
-# Test: workflow-status-check mentions Jira in drift reconciliation
-test_workflow_mentions_jira_reconcile() {
-    local workflow_file="$PROJECT_ROOT/pennyfarthing-dist/agents/workflow-status-check.md"
-
-    if [[ ! -f "$workflow_file" ]]; then
-        fail "workflow mentions Jira reconcile" "file exists" "workflow-status-check.md not found"
-        return
-    fi
-
-    if grep -qiE 'jira.*done|transition.*jira|jira.*status' "$workflow_file" 2>/dev/null; then
-        pass "workflow-status-check mentions Jira in reconciliation"
-    else
-        fail "workflow mentions Jira reconcile" \
-             "Jira transition reference in workflow-status-check.md" \
-             "Jira reconcile not found"
-    fi
-}
-
 test_reconcile_function_exists
 test_reconcile_uses_update
 test_reconcile_transitions_jira
 test_reconcile_logs_event
-test_offers_reconcile_option
-test_workflow_mentions_jira_reconcile
 
 echo ""
 
@@ -580,7 +504,7 @@ if [[ $TESTS_FAILED -gt 0 ]]; then
     echo "  2. Output format: story_id:yaml_status:jira_status (AC2)"
     echo "     - Clear, user-friendly terminology"
     echo "     - Include both YAML and Jira status"
-    echo "  3. Add Step 2.5 to workflow-status-check.md (AC1, AC2)"
+    echo "  3. Add drift detection to prime/workflow.py (AC1, AC2)"
     echo "     - Call detect_drift after git scan"
     echo "     - Report drifted stories before state determination"
     echo "  4. Add auto-reconcile option (AC3)"

package/pennyfarthing-dist/scripts/theme/README.md

@@ -18,5 +18,5 @@ Scripts for managing agent persona themes.
 
 ## Ownership
 
-- **Primary users:** `/theme` skill, `/set-theme` command
+- **Primary users:** `/theme` skill
 - **Maintained by:** Core Pennyfarthing team

package/pennyfarthing-dist/scripts/validation/validate-agent-schema.sh

@@ -52,7 +52,6 @@ SUBAGENTS=(
     "sm-finish.md"
     "sm-file-summary.md"
     "sm-handoff.md"
-    "workflow-status-check.md"
     "testing-runner.md"
     "reviewer-preflight.md"
 )

package/pennyfarthing-dist/scripts/workflow/finish-story.sh

@@ -15,7 +15,8 @@
 # 2. Squash merge PR and delete remote branch
 # 3. Transition Jira to Done
 # 4. Update sprint YAML (status: done, completed date)
-# 5. Clean up local branch and session file
+# 5. Archive completed epics (if last story in epic was just finished)
+# 6. Clean up local branch and session file
 
 set -euo pipefail
 
@@ -43,31 +44,64 @@ fi
 # Find project root
 source "$(dirname "${BASH_SOURCE[0]}")/../lib/find-root.sh"
 
-SESSION_FILE="$PROJECT_ROOT/.session/${STORY_ID}-session.md"
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 ARCHIVE_DIR="$PROJECT_ROOT/sprint/archive"
 
 # Ensure archive directory exists
 mkdir -p "$ARCHIVE_DIR"
 
+# Resolve session file: prefer Jira key, fall back to numeric story ID
+SESSION_FILE="$PROJECT_ROOT/.session/${STORY_ID}-session.md"
+if [[ ! -f "$SESSION_FILE" ]]; then
+  # Look up Jira key from sprint YAML and try that
+  _JIRA_LOOKUP=$(pf sprint story field "$STORY_ID" jira 2>/dev/null || echo "")
+  if [[ -n "$_JIRA_LOOKUP" && "$_JIRA_LOOKUP" != "null" ]]; then
+    ALT_SESSION="$PROJECT_ROOT/.session/${_JIRA_LOOKUP}-session.md"
+    if [[ -f "$ALT_SESSION" ]]; then
+      SESSION_FILE="$ALT_SESSION"
+    fi
+  fi
+fi
+
+# Also try the reverse: if called with Jira key, try numeric ID
+if [[ ! -f "$SESSION_FILE" ]]; then
+  # List session files and look for one containing the story ID
+  for f in "$PROJECT_ROOT/.session/"*-session.md; do
+    [[ -f "$f" ]] || continue
+    if grep -q "$STORY_ID" "$f" 2>/dev/null; then
+      SESSION_FILE="$f"
+      break
+    fi
+  done
+fi
+
 # Validate session file exists
 if [[ ! -f "$SESSION_FILE" ]]; then
-  echo "Error: Session file not found: $SESSION_FILE"
+  echo "Error: Session file not found for story $STORY_ID"
+  echo "Looked for: $PROJECT_ROOT/.session/${STORY_ID}-session.md"
+  [[ -n "${_JIRA_LOOKUP:-}" ]] && echo "Also tried: $PROJECT_ROOT/.session/${_JIRA_LOOKUP}-session.md"
   exit 1
 fi
 
-# Extract metadata from session file (handle both "**Jira:**" and "- **Jira:**" formats)
-# Also handle markdown link format: [MSSCI-12721](https://...)
+# Extract metadata from session file
+# Try **Jira:** field first (handle both "**Jira:**" and "- **Jira:**", markdown link format)
 JIRA_KEY=$(grep -E '\*\*Jira:\*\*' "$SESSION_FILE" | sed 's/.*\*\*Jira:\*\* //' | sed 's/\[//' | sed 's/\].*//' | tr -d ' ' || echo "")
-# Extract branch - strip any trailing annotations like "(pushed)"
-BRANCH=$(grep -E '\*\*Branch:\*\*' "$SESSION_FILE" | sed 's/.*\*\*Branch:\*\* //' | sed 's/ *(.*//' | tr -d ' ' || echo "")
 
-# Try to get PR number from session file first (format: **PR:** #422 - title)
-PR_NUMBER=$(grep -E '\*\*PR:\*\*' "$SESSION_FILE" | sed 's/.*#\([0-9]*\).*/\1/' || echo "")
+# Fallback: extract MSSCI key from **ID:** field (format: "MSSCI-14459 (81-2)" or just "MSSCI-14459")
+if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
+  JIRA_KEY=$(grep -E '\*\*ID:\*\*' "$SESSION_FILE" | grep -oE 'MSSCI-[0-9]+' | head -1 || echo "")
+fi
 
-# Fallback: try to get Jira key from sprint YAML if not in session
+# Fallback: if STORY_ID itself is a Jira key, use it directly
 if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
-  JIRA_KEY=$(yq ".epics[].stories[] | select(.id == \"$STORY_ID\") | .jira // \"\"" "$SPRINT_FILE" 2>/dev/null | head -1 || echo "")
+  if [[ "$STORY_ID" =~ ^MSSCI-[0-9]+$ ]]; then
+    JIRA_KEY="$STORY_ID"
+  fi
+fi
+
+# Fallback: look up Jira key from sprint YAML via pf CLI
+if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
+  JIRA_KEY=$(pf sprint story field "$STORY_ID" jira 2>/dev/null || echo "")
 fi
 
 if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
@@ -76,6 +110,12 @@ if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
   exit 1
 fi
 
+# Extract branch - strip any trailing annotations like "(pushed)"
+BRANCH=$(grep -E '\*\*Branch:\*\*' "$SESSION_FILE" | sed 's/.*\*\*Branch:\*\* //' | sed 's/ *(.*//' | tr -d ' ' || echo "")
+
+# Try to get PR number from session file first (format: **PR:** #422 - title)
+PR_NUMBER=$(grep -E '\*\*PR:\*\*' "$SESSION_FILE" | sed 's/.*#\([0-9]*\).*/\1/' || echo "")
+
 # Fallback: get PR number from GitHub if not in session file
 if [[ -z "$PR_NUMBER" ]] && [[ -n "$BRANCH" ]]; then
   PR_NUMBER=$(gh pr list --head "$BRANCH" --json number --jq '.[0].number' 2>/dev/null || echo "")
@@ -99,8 +139,9 @@ if $DRY_RUN; then
   fi
   echo "  3. Transition $JIRA_KEY to Done"
   echo "  4. Update sprint YAML (status: done, completed: $TODAY)"
-  echo "  5. Delete local branch: $BRANCH"
-  echo "  6. Remove session file"
+  echo "  5. Archive any completed epics"
+  echo "  6. Delete local branch: $BRANCH"
+  echo "  7. Remove session file"
   exit 0
 fi
 
@@ -135,8 +176,12 @@ yq eval -i "(.epics[].stories[] | select(.id == \"$STORY_ID\")).completed = \"$T
 yq eval -i "del((.epics[].stories[] | select(.id == \"$STORY_ID\")).assigned_to)" "$SPRINT_FILE"
 echo "   → status: done, completed: $TODAY"
 
-# Step 5: Clean up git
-echo "5. Cleaning up git..."
+# Step 5: Archive completed epics
+echo "5. Archiving completed epics..."
+pf sprint epic archive 2>/dev/null && echo "   → Checked for completed epics" || echo "   → No epics to archive"
+
+# Step 6: Clean up git
+echo "6. Cleaning up git..."
 git checkout develop 2>/dev/null || git checkout main 2>/dev/null || true
 git pull origin "$(git branch --show-current)" 2>/dev/null || true
 
@@ -144,8 +189,8 @@ if [[ -n "$BRANCH" ]]; then
   git branch -d "$BRANCH" 2>/dev/null || echo "   Local branch already deleted"
 fi
 
-# Step 6: Remove session file
-echo "6. Removing session file..."
+# Step 7: Remove session file
+echo "7. Removing session file..."
 rm "$SESSION_FILE"
 
 echo ""

package/pennyfarthing-dist/skills/dev-patterns/SKILL.md

@@ -278,11 +278,11 @@ Design subagents to do multiple related steps in one spawn:
 
 ```yaml
 # INEFFICIENT - 2 subagent spawns
-Spawn 1: workflow-status-check
+Spawn 1: sm-setup MODE=research
 Spawn 2: sm-file-summary
 
 # EFFICIENT - 1 compound subagent
-Spawn 1: (combined status-check + file-summary subagent)
+Spawn 1: (combined research + file-summary subagent)
 ```
 
 **Good candidates for combining:**

package/pennyfarthing-dist/skills/skill-registry.yaml

@@ -141,7 +141,7 @@ skills:
         invocation: /jira assign ISSUE-123
     anti_patterns:
       - Don't bypass Jira for sprint tracking
-    related_skills: [sprint, story]
+    related_skills: [sprint]
     keywords: [atlassian, issues, tickets, backlog]
 
   judge:
@@ -251,20 +251,26 @@ skills:
 
   sprint:
     name: sprint
-    description: Sprint status, backlog, and story management for Pennyfarthing
+    description: Sprint status, backlog, story, and epic management for Pennyfarthing
     category: project-management
-    tags: [sprint, status, backlog]
-    version: "1.0.0"
+    tags: [sprint, status, backlog, stories, epics]
+    version: "2.0.0"
     prerequisites: []
     examples:
       - context: Checking sprint status
         invocation: /sprint
       - context: Finding available stories
         invocation: /sprint backlog
+      - context: Adding a story
+        invocation: /sprint story add epic-76 "My story" 3
+      - context: Sizing guidelines
+        invocation: /sprint story size
+      - context: Adding an epic
+        invocation: /sprint epic add epic-85 "New epic"
     anti_patterns:
       - Don't manually edit sprint YAML - use scripts
-    related_skills: [story, jira]
-    keywords: [sprint, backlog, velocity, kanban]
+    related_skills: [jira]
+    keywords: [sprint, backlog, velocity, kanban, stories, epics, sizing, templates]
     allowed_tools: [Read, Glob, Grep, Bash, Task]
 
   systematic-debugging:
@@ -287,18 +293,21 @@ skills:
 
   story:
     name: story
-    description: Story creation, sizing, and templates for Pennyfarthing workflow
+    description: "DEPRECATED: Use /sprint story instead. Story commands consolidated under /sprint."
     category: project-management
-    tags: [stories, sizing, workflow]
-    version: "1.0.0"
+    tags: [stories, sizing, workflow, deprecated]
+    version: "2.0.0"
+    deprecated: true
+    redirect: sprint
     prerequisites: []
     examples:
       - context: Creating new stories
-        invocation: /story create
+        invocation: /sprint story add
       - context: Sizing stories
-        invocation: /story size
+        invocation: /sprint story size
     anti_patterns:
       - Don't create stories without acceptance criteria
+      - Don't use /story directly - use /sprint story instead
     related_skills: [sprint, jira]
     keywords: [user-stories, estimation, points, acceptance-criteria]
 
@@ -322,37 +331,41 @@ skills:
 
   theme:
     name: theme
-    description: Manage persona themes - list, show, and set active theme
+    description: Manage persona themes - list, show, set, create, and interactive maker wizard
     category: theming
-    tags: [personas, themes, customization]
-    version: "1.0.0"
+    tags: [personas, themes, customization, creation]
+    version: "2.0.0"
     prerequisites: []
     examples:
       - context: Listing available themes
-        invocation: /list-themes
+        invocation: /theme list
       - context: Showing current theme
-        invocation: /show-theme
+        invocation: /theme show
       - context: Setting active theme
-        invocation: /set-theme discworld
+        invocation: /theme set discworld
+      - context: Creating a new theme
+        invocation: /theme create my-theme --base discworld
+      - context: Interactive AI-driven theme wizard
+        invocation: /theme maker
     anti_patterns:
       - Don't edit config.local.yaml directly - use skill
-    related_skills: [theme-creation]
-    keywords: [personas, characters, discworld, literary-classics]
+      - Don't use deprecated /set-theme, /show-theme, /list-themes, /create-theme, /theme-maker
+    related_skills: []
+    keywords: [personas, characters, discworld, literary-classics, custom, generation, wizard]
 
   theme-creation:
     name: theme-creation
-    description: Create custom persona themes with AI-driven generation
+    description: "DEPRECATED: Use /theme maker instead"
     category: theming
     tags: [personas, themes, creation]
-    version: "1.0.0"
-    prerequisites: [theme]
+    version: "2.0.0"
+    deprecated: true
+    redirect: theme
+    prerequisites: []
     examples:
-      - context: Creating new theme
-        invocation: /theme-maker
       - context: Interactive theme wizard
-        invocation: /create-theme
-    anti_patterns:
-      - Don't create incomplete themes missing required agents
+        invocation: /theme maker
+    anti_patterns: []
     related_skills: [theme]
     keywords: [personas, custom, generation, wizard]
 
@@ -372,7 +385,7 @@ skills:
         invocation: /workflow start architecture
     anti_patterns:
       - Don't switch workflows mid-story unless requirements fundamentally changed
-    related_skills: [sprint, story]
+    related_skills: [sprint]
     keywords: [tdd, trivial, agent-docs, bdd, architecture, bikelane, stepped, phased]
 
   yq: