@pennyfarthing/core 10.0.5 → 10.2.0

package/pennyfarthing-dist/scripts/hooks/post-merge.sh

@@ -6,7 +6,8 @@
 # story branch is merged and automatically updating the sprint YAML status.
 #
 # Installation:
-#   Installed to .git/hooks/post-merge by pennyfarthing init or doctor --fix
+#   End-user projects: pennyfarthing init (copies to .git/hooks/)
+#   Framework/orchestrator: install-git-hooks.sh (symlinks to pennyfarthing-dist/)
 #
 # Dependencies:
 #   - yq (for YAML manipulation)
@@ -14,11 +15,17 @@
 
 set -uo pipefail
 
-# Self-locate (resolve symlink first for .git/hooks/ symlinks)
+# Find project root
+# Try find-root.sh via symlink resolution first, then fall back to .git location
 REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]:-$0}" 2>/dev/null || realpath "${BASH_SOURCE[0]:-$0}" 2>/dev/null || echo "${BASH_SOURCE[0]:-$0}")"
-source "$(dirname "$REAL_SCRIPT")/../lib/find-root.sh"
-
-# PROJECT_ROOT is now set by find-root.sh
+FIND_ROOT="$(dirname "$REAL_SCRIPT")/../lib/find-root.sh"
+if [[ -f "$FIND_ROOT" ]]; then
+    source "$FIND_ROOT"
+else
+    # Running as a copy in .git/hooks/ — derive PROJECT_ROOT from git dir
+    PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/../.." && pwd)"
+    export PROJECT_ROOT
+fi
 SESSION_DIR="$PROJECT_ROOT/.session"
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"
 
@@ -40,7 +47,7 @@ extract_story_id() {
 
 # update_story_status STORY_ID NEW_STATUS
 # Update story status in sprint YAML and add completed date
-# Uses yq for YAML manipulation
+# Handles both inline stories in current-sprint.yaml and sharded epic files
 update_story_status() {
     local story_id="$1"
     local new_status="${2:-done}"
@@ -51,23 +58,33 @@ update_story_status() {
         return 1
     fi
 
-    # Check if yq is available
     if ! command -v yq &>/dev/null; then
         echo "Warning: yq not found, cannot update sprint YAML" >&2
         return 1
     fi
 
-    # Extract epic and story numbers
-    local epic_num="${story_id%%-*}"
-    local story_num="${story_id#*-}"
+    local sprint_dir
+    sprint_dir="$(dirname "$SPRINT_FILE")"
 
-    # Update status and add completed date using yq
+    # Try inline stories in current-sprint.yaml first
     yq eval -i "
-        (.epics[] | select(.id == \"$epic_num\") | .stories[] | select(.id == \"$story_num\")).status = \"$new_status\" |
-        (.epics[] | select(.id == \"$epic_num\") | .stories[] | select(.id == \"$story_num\")).completed = \"$completed_date\"
-    " "$SPRINT_FILE"
+        (.stories[] | select(.id == \"$story_id\")).status = \"$new_status\" |
+        (.stories[] | select(.id == \"$story_id\")).completed = \"$completed_date\"
+    " "$SPRINT_FILE" 2>/dev/null
+
+    # Also try each epic shard file
+    for shard in "$sprint_dir"/epic-*.yaml; do
+        [[ -f "$shard" ]] || continue
+        if yq eval ".stories[] | select(.id == \"$story_id\")" "$shard" 2>/dev/null | grep -q "$story_id"; then
+            yq eval -i "
+                (.stories[] | select(.id == \"$story_id\")).status = \"$new_status\" |
+                (.stories[] | select(.id == \"$story_id\")).completed = \"$completed_date\"
+            " "$shard"
+            return $?
+        fi
+    done
 
-    return $?
+    return 0
 }
 
 # log_reconciliation STORY_ID MESSAGE

package/pennyfarthing-dist/scripts/hooks/pre-commit.sh

@@ -8,8 +8,8 @@
 # 3. Validates sprint YAML files when sprint/*.yaml is modified
 #
 # Installation:
-#   Installed to .git/hooks/pre-commit by pennyfarthing init or doctor --fix
-#   Or symlink: ln -sf ../../pennyfarthing-dist/scripts/hooks/pre-commit.sh .git/hooks/pre-commit
+#   End-user projects: pennyfarthing init (copies to .git/hooks/)
+#   Framework/orchestrator: install-git-hooks.sh (symlinks to pennyfarthing-dist/)
 
 set -uo pipefail
 
@@ -114,7 +114,8 @@ fi
 
 SPRINT_YAML_FILES=$(git diff --cached --name-only -- 'sprint/*.yaml' 'sprint/archive/*.yaml' 2>/dev/null \
     | grep -v 'sprint-template\.yaml$' \
-    | grep -v 'sprint/completed\.yaml$' || true)
+    | grep -v 'sprint/completed\.yaml$' \
+    | grep -v 'sprint/context/archived/' || true)
 
 if [[ -n "$SPRINT_YAML_FILES" ]]; then
     echo "Sprint YAML files staged for commit:"

package/pennyfarthing-dist/scripts/hooks/pre-push.sh

@@ -4,15 +4,21 @@
 # Checks if sprint files were modified and reminds to sync to Jira.
 #
 # Installation:
-#   Installed to .git/hooks/pre-push by pennyfarthing init or doctor --fix
-#   Or symlink: ln -sf ../../pennyfarthing-dist/scripts/hooks/pre-push.sh .git/hooks/pre-push
+#   End-user projects: pennyfarthing init (copies to .git/hooks/)
+#   Framework/orchestrator: install-git-hooks.sh (symlinks to pennyfarthing-dist/)
 
 set -uo pipefail
 
-# Self-locate (resolve symlink first for .git/hooks/ symlinks)
+# Find project root
+# Try find-root.sh via symlink resolution first, then fall back to .git location
 REAL_SCRIPT="$(readlink -f "${BASH_SOURCE[0]:-$0}" 2>/dev/null || realpath "${BASH_SOURCE[0]:-$0}" 2>/dev/null || echo "${BASH_SOURCE[0]:-$0}")"
-if ! source "$(dirname "$REAL_SCRIPT")/../lib/find-root.sh" 2>/dev/null; then
-    exit 0
+FIND_ROOT="$(dirname "$REAL_SCRIPT")/../lib/find-root.sh"
+if [[ -f "$FIND_ROOT" ]]; then
+    source "$FIND_ROOT"
+else
+    # Running as a copy in .git/hooks/ — derive PROJECT_ROOT from git dir
+    PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/../.." && pwd)"
+    export PROJECT_ROOT
 fi
 
 SPRINT_FILE="$PROJECT_ROOT/sprint/current-sprint.yaml"

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

@@ -7,7 +7,7 @@ Uncategorized utilities and one-off scripts.
 | Script | Purpose |
 |--------|---------|
 | `deploy.sh` | Deployment script |
-| `doctor-dogfood.sh` | Health check for dogfooding setup |
+| `doctor-dogfood.sh` | Health check for framework/orchestrator development setup |
 | `run-ci.sh` | Run CI locally |
 | `statusline.sh` | Status line configuration |
 | `uninstall.sh` | Uninstall Pennyfarthing from project |

package/pennyfarthing-dist/scripts/misc/statusline.sh

@@ -134,6 +134,39 @@ if [ -n "$config_file" ] && [ -n "$agent_name" ]; then
 fi
 theme_display="$character_display"
 
+# Tandem indicator: detect active backseat agent from observation files
+# Files: .session/{storyId}-tandem-{partner}.md (created by backseat spawn, cleaned on finish)
+tandem_partner=""
+tandem_partner_display=""
+if [ -d "$PROJECT_ROOT/.session" ]; then
+    tandem_file=$(find "$PROJECT_ROOT/.session" -maxdepth 1 -name "*-tandem-*.md" -print 2>/dev/null | head -1)
+    if [ -n "$tandem_file" ]; then
+        # Extract partner name from filename: {storyId}-tandem-{partner}.md
+        tandem_partner=$(basename "$tandem_file" | sed -n 's/.*-tandem-\([a-zA-Z_-]*\)\.md$/\1/p')
+        if [ -n "$tandem_partner" ] && [ -n "$theme_file" ] && [ -f "$theme_file" ]; then
+            # Look up partner's character name from theme
+            partner_full=$(yq ".agents.${tandem_partner}.character" "$theme_file" 2>/dev/null)
+            if [ -n "$partner_full" ] && [ "$partner_full" != "null" ]; then
+                partner_clean=$(echo "$partner_full" | sed 's/ *([^)]*)//g' | xargs)
+                partner_clean=$(echo "$partner_clean" | sed -E 's/^(Captain|Lieutenant|Dr\.|Doc|Mr\.|Mrs\.|Ms\.|Admiral|Commander|Chief|Ensign|Translator|Agent|Colonel|Major|Sergeant|Professor|Lord|Lady|Sir|The) +//i')
+                partner_wc=$(echo "$partner_clean" | wc -w | tr -d ' ')
+                if [ "$partner_wc" -eq 1 ]; then
+                    tandem_partner_display="$partner_clean"
+                else
+                    tandem_partner_display=$(echo "$partner_clean" | awk '{print $NF}')
+                fi
+            fi
+            # Fallback to agent abbreviation if no theme character
+            if [ -z "$tandem_partner_display" ]; then
+                tandem_partner_display=$(get_agent_abbrev "$tandem_partner")
+            fi
+        elif [ -n "$tandem_partner" ]; then
+            # No theme file — use abbreviation
+            tandem_partner_display=$(get_agent_abbrev "$tandem_partner")
+        fi
+    fi
+fi
+
 # ANSI colors
 RESET=$'\033[0m'
 DIM=$'\033[2m'
@@ -214,20 +247,29 @@ repo_fmt=$(printf "%-14s" "$dir_name")
 branch_fmt=$(printf "%-12s" "${branch}${branch_dirty}")
 model_fmt=$(printf "%-10s" "$model")
 
-# Build agent display: [ROLE] Theme (role in reverse text with color)
+# Build tandem suffix: "+ Partner" when backseat agent is active
+tandem_suffix=""
+tandem_suffix_len=0
+if [ -n "$tandem_partner_display" ]; then
+    partner_color=$(get_agent_color "$tandem_partner")
+    tandem_suffix=" ${DIM}+${RESET} ${partner_color}${tandem_partner_display}${RESET}"
+    tandem_suffix_len=$((3 + ${#tandem_partner_display}))  # " + " + name
+fi
+
+# Build agent display: [ROLE] Theme (+ Partner) (role in reverse text with color)
 if [ -n "$agent_abbrev" ]; then
     agent_color=$(get_agent_color "$agent_name")
     # Role in reverse text with color, then theme
     if [ -n "$theme_display" ]; then
-        agent_section="${agent_color}${REVERSE} ${agent_abbrev} ${RESET} ${DIM}${theme_display}${RESET}"
-        # Pad to ~20 chars visual width (abbrev ~3 + spaces ~2 + theme ~10 = ~15, pad to 20)
-        pad_len=$((18 - ${#agent_abbrev} - ${#theme_display}))
+        agent_section="${agent_color}${REVERSE} ${agent_abbrev} ${RESET} ${DIM}${theme_display}${RESET}${tandem_suffix}"
+        # Pad to ~20 chars visual width (abbrev ~3 + spaces ~2 + theme ~10 + tandem = ~15+, pad to 20)
+        pad_len=$((18 - ${#agent_abbrev} - ${#theme_display} - tandem_suffix_len))
         [ "$pad_len" -lt 0 ] && pad_len=0
         padding=$(printf "%${pad_len}s" "")
         agent_section="${agent_section}${padding}"
     else
-        agent_section="${agent_color}${REVERSE} ${agent_abbrev} ${RESET}"
-        pad_len=$((17 - ${#agent_abbrev}))
+        agent_section="${agent_color}${REVERSE} ${agent_abbrev} ${RESET}${tandem_suffix}"
+        pad_len=$((17 - ${#agent_abbrev} - tandem_suffix_len))
         [ "$pad_len" -lt 0 ] && pad_len=0
         padding=$(printf "%${pad_len}s" "")
         agent_section="${agent_section}${padding}"
@@ -235,8 +277,8 @@ if [ -n "$agent_abbrev" ]; then
 else
     # No agent - just show theme if available
     if [ -n "$theme_display" ]; then
-        agent_section="${DIM}${theme_display}${RESET}"
-        pad_len=$((20 - ${#theme_display}))
+        agent_section="${DIM}${theme_display}${RESET}${tandem_suffix}"
+        pad_len=$((20 - ${#theme_display} - tandem_suffix_len))
         [ "$pad_len" -lt 0 ] && pad_len=0
         padding=$(printf "%${pad_len}s" "")
         agent_section="${agent_section}${padding}"

package/pennyfarthing-dist/scripts/misc/validate-subagent-frontmatter.sh

@@ -31,9 +31,8 @@ NC='\033[0m' # No Color
 # Required fields in frontmatter
 REQUIRED_FIELDS=("name" "description" "tools" "model")
 
-# Expected subagent files (8 total - consolidated in Story 31-11/31-12)
+# Expected subagent files (7 total - consolidated in Story 31-11/31-12)
 EXPECTED_SUBAGENTS=(
-    "workflow-status-check.md"
     "sm-setup.md"
     "sm-finish.md"
     "sm-file-summary.md"

package/pennyfarthing-dist/scripts/tests/handoff-phase-update.test.sh

@@ -6,7 +6,7 @@
 # - AC1: Updating **Phase:** field to next phase
 # - AC2: Updating Phase History table with end timestamp and duration
 # - AC3: Adding Handoff History row with gate and status
-# - AC4: workflow-status-check correctly detects phase (integration)
+# - AC4: prime correctly detects phase (integration)
 # - AC5: All three transitions documented (TEA→Dev, Dev→Reviewer, Reviewer→SM)
 
 set -euo pipefail
@@ -190,14 +190,14 @@ run_test test_ac3_status_in_history
 run_test test_ac3_explicit_edit_for_history
 
 # ==============================================================================
-# AC4: workflow-status-check correctly detects current phase after handoff
+# AC4: prime correctly detects current phase after handoff
 # ==============================================================================
 echo ""
-echo "--- AC4: workflow-status-check compatibility ---"
+echo "--- AC4: prime/workflow.py compatibility ---"
 
 test_ac4_phase_field_format() {
-    # Phase field must use exact format that workflow-status-check expects
-    # workflow-status-check greps for: **Phase:**
+    # Phase field must use exact format that prime/workflow.py expects
+    # parse_session_header greps for: **Phase:**
     if echo "$HANDOFF_CONTENT" | grep -q '\*\*Phase:\*\*'; then
         pass "AC4.1: Uses correct **Phase:** format"
     else

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/README.md

@@ -6,7 +6,7 @@ Scripts for workflow mechanics, phase transitions, and quality gates.
 
 | Script | Purpose |
 |--------|---------|
-| `finish-story.sh` | Story completion workflow (archive, PR merge, Jira transition) |
+| `finish-story.sh` | **DEPRECATED** — forwards to `pf sprint story finish` |
 | `fix-session-phase.sh` | Repair session file phase state |
 | `check.sh` | Quality gates runner (lint, type check, tests) |
 | `list-workflows.sh` | List available workflows |
@@ -18,7 +18,7 @@ Scripts for workflow mechanics, phase transitions, and quality gates.
 ## Usage
 
 ```bash
-.pennyfarthing/scripts/workflow/finish-story.sh MSSCI-12345
+pf sprint story finish MSSCI-12345
 .pennyfarthing/scripts/workflow/start-workflow.sh prd --mode create
 ```