@pennyfarthing/core 10.0.5 → 10.2.0

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

@@ -1,154 +1,20 @@
 #!/bin/bash
-# Finish a story: archive, merge PR, transition Jira, update sprint YAML
-# Usage: finish-story.sh <story-id> [--dry-run]
-#
-# Example: finish-story.sh MSSCI-12052
-#          finish-story.sh MSSCI-12052 --dry-run
+# DEPRECATED: Use `pf sprint story finish` instead.
 #
-# Prerequisites:
-# - Session file exists at .session/{story-id}-session.md
-# - PR is approved and mergeable
-# - Reviewer has approved (phase: finish in session)
+# This shell script had a bug where yq paths targeted .epics[].stories[]
+# but the sprint YAML uses sharded epic files with .stories[] at root.
+# The Python implementation (pennyfarthing_scripts.sprint.story_finish)
+# correctly handles sharded YAML via read_sprint/write_sprint.
 #
-# This script performs:
-# 1. Archive session file to sprint/archive/{jira-key}-session.md
-# 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
+# Usage: finish-story.sh <story-id> [--dry-run]
 
 set -euo pipefail
 
-STORY_ID="${1:-}"
-DRY_RUN=false
+echo "DEPRECATED: finish-story.sh is deprecated. Forwarding to 'pf sprint story finish'." >&2
 
-# Parse options
+ARGS=()
 for arg in "$@"; do
-  case $arg in
-    --dry-run)
-      DRY_RUN=true
-      shift
-      ;;
-  esac
+  ARGS+=("$arg")
 done
 
-if [[ -z "$STORY_ID" ]]; then
-  echo "Usage: finish-story.sh <story-id> [--dry-run]"
-  echo ""
-  echo "Options:"
-  echo "  --dry-run    Show what would be done without executing"
-  exit 1
-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"
-
-# Validate session file exists
-if [[ ! -f "$SESSION_FILE" ]]; then
-  echo "Error: Session file not found: $SESSION_FILE"
-  exit 1
-fi
-
-# Extract metadata from session file (handle both "**Jira:**" and "- **Jira:**" formats)
-# Also handle markdown link format: [MSSCI-12721](https://...)
-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: try to get Jira key from sprint YAML if not in session
-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 "")
-fi
-
-if [[ -z "$JIRA_KEY" || "$JIRA_KEY" == "null" ]]; then
-  echo "Error: Could not determine Jira key for story $STORY_ID"
-  echo "Check session file or sprint YAML for jira: field"
-  exit 1
-fi
-
-# 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 "")
-fi
-
-TODAY=$(date +%Y-%m-%d)
-
-echo "=== Finish Story: $STORY_ID ==="
-echo "Jira Key: $JIRA_KEY"
-echo "Branch: ${BRANCH:-none}"
-echo "PR: ${PR_NUMBER:-none}"
-echo ""
-
-if $DRY_RUN; then
-  echo "[DRY RUN] Would perform:"
-  echo "  1. Archive session → $ARCHIVE_DIR/${JIRA_KEY}-session.md"
-  if [[ -n "$PR_NUMBER" ]]; then
-    echo "  2. Merge PR #$PR_NUMBER (squash, delete branch)"
-  else
-    echo "  2. No PR to merge"
-  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"
-  exit 0
-fi
-
-# Step 1: Archive session file
-echo "1. Archiving session file..."
-cp "$SESSION_FILE" "$ARCHIVE_DIR/${JIRA_KEY}-session.md"
-echo "   → $ARCHIVE_DIR/${JIRA_KEY}-session.md"
-
-# Step 2: Merge PR (if exists)
-if [[ -n "$PR_NUMBER" ]]; then
-  echo "2. Merging PR #$PR_NUMBER..."
-  gh pr merge "$PR_NUMBER" --squash --delete-branch || {
-    echo "   Warning: PR merge failed (may already be merged)"
-  }
-else
-  echo "2. No PR found for branch $BRANCH (skipping merge)"
-fi
-
-# Step 3: Transition Jira to Done
-echo "3. Transitioning Jira to Done..."
-jira issue move "$JIRA_KEY" "Done" 2>/dev/null || {
-  echo "   Warning: Jira transition failed (may already be Done)"
-}
-
-# Step 4: Update sprint YAML
-echo "4. Updating sprint YAML..."
-# Update status to done
-yq eval -i "(.epics[].stories[] | select(.id == \"$STORY_ID\")).status = \"done\"" "$SPRINT_FILE"
-# Add completed date
-yq eval -i "(.epics[].stories[] | select(.id == \"$STORY_ID\")).completed = \"$TODAY\"" "$SPRINT_FILE"
-# Remove assigned_to (no longer in progress)
-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..."
-git checkout develop 2>/dev/null || git checkout main 2>/dev/null || true
-git pull origin "$(git branch --show-current)" 2>/dev/null || true
-
-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..."
-rm "$SESSION_FILE"
-
-echo ""
-echo "=== Story $STORY_ID Complete ==="
-echo "Archived: sprint/archive/${JIRA_KEY}-session.md"
-echo "Jira: https://1898andco.atlassian.net/browse/$JIRA_KEY"
+exec pf sprint story finish "${ARGS[@]}"

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.schema.json

@@ -98,6 +98,14 @@
           "type": "array",
           "items": { "type": "string" },
           "description": "Tools this skill is allowed to use. If omitted, all tools are allowed. Use to restrict read-only skills from writing."
+        },
+        "deprecated": {
+          "type": "boolean",
+          "description": "Whether this skill is deprecated"
+        },
+        "redirect": {
+          "type": "string",
+          "description": "Skill name to redirect to when deprecated"
         }
       },
       "required": ["name", "description", "category", "tags"],

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

@@ -331,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]
 
@@ -382,7 +386,7 @@ skills:
     anti_patterns:
       - Don't switch workflows mid-story unless requirements fundamentally changed
     related_skills: [sprint]
-    keywords: [tdd, trivial, agent-docs, bdd, architecture, bikelane, stepped, phased]
+    keywords: [tdd, tdd-tandem, trivial, agent-docs, bdd, bdd-tandem, architecture, bikelane, stepped, phased]
 
   yq:
     name: yq

package/pennyfarthing-dist/skills/sprint/skill.md

@@ -293,7 +293,7 @@ pf sprint story add <epic-id> "<title>" <points> [options]
 | `points` | Yes | Story points (1, 2, 3, 5, 8) |
 | `--type` | No | Story type: feature, bug, chore, refactor (default: feature) |
 | `--priority` | No | Priority: P0, P1, P2, P3 (default: P1) |
-| `--workflow` | No | Workflow: tdd, trivial, bdd (default: tdd) |
+| `--workflow` | No | Workflow: tdd, tdd-tandem, trivial, bdd, bdd-tandem (default: tdd) |
 | `--jira` | No | Jira issue key |
 </args>
 
@@ -399,6 +399,28 @@ pf sprint story claim <story-id>
 
 ---
 
+### `/sprint story assign <story-id> <assignee>`
+
+Assign a Jira story to a user. Shortcut for `/jira assign`.
+
+<run>
+pf jira assign <story-id> <assignee>
+</run>
+
+<args>
+| Arg | Required | Description |
+|-----|----------|-------------|
+| `story-id` | Yes | Jira key (e.g., `MSSCI-14552`) |
+| `assignee` | Yes | Email or GitHub username (e.g., `keith.avery@1898andco.io`, `slabgorb`) |
+</args>
+
+<example>
+pf jira assign MSSCI-14552 keith.avery@1898andco.io
+pf jira assign MSSCI-14552 slabgorb
+</example>
+
+---
+
 ### `/sprint epic add <epic-id> <title> [options]`
 
 Add a new epic to the current sprint.
@@ -696,7 +718,7 @@ All gates must pass before handoff:
 | Sprint name | `"TO Sprint YYWW"` (e.g., "TO Sprint 2604") |
 | Story IDs | Jira keys `MSSCI-XXXXX` |
 | Status | `backlog`, `ready`, `in_progress`, `done` |
-| Workflow | `tdd`, `trivial`, `agent-docs`, `bdd` |
+| Workflow | `tdd`, `tdd-tandem`, `trivial`, `agent-docs`, `bdd`, `bdd-tandem` |
 | Priority | `P0`, `P1`, `P2`, `P3` |
 | in_sprint | `true`, `false` - Jira sprint membership |
 
@@ -761,6 +783,7 @@ For Jira integration, see `/jira` skill prerequisites.
 | `/sprint story template` | `pf sprint story template` |
 | `/sprint story finish ID` | `pf sprint story finish ID` |
 | `/sprint story claim ID` | `pf sprint story claim ID` |
+| `/sprint story assign ID USER` | `pf jira assign ID USER` |
 | `/sprint epic show ID` | `pf sprint epic show ID` |
 | `/sprint epic field ID FIELD` | `pf sprint epic field ID FIELD` |
 | `/sprint epic add ...` | `pf sprint epic add ...` |