@pennyfarthing/core 7.5.0 → 7.6.0

package/pennyfarthing-dist/scripts/workflow/check.sh

@@ -0,0 +1,497 @@
+#!/usr/bin/env bash
+# check.sh - Quality gate runner for pre-handoff verification
+#
+# Story 21-1: /check command with dev-handoff integration
+#
+# Usage: ./scripts/check.sh [OPTIONS]
+#
+# Options:
+#   --skip-check       Skip all checks (emergency bypass)
+#   --tests-only       Run only tests, skip lint and typecheck
+#   --filter PATTERN   Filter tests by pattern (passed to test runner)
+#   --repo REPO        Run checks in specific repo subdirectory
+#   --no-lint          Skip lint check
+#   --no-typecheck     Skip type check
+#   --fast             Skip slow packages (cyclist/Electron) for rapid iteration
+#
+# Runs lint, type check, and tests. Reports pass/fail status.
+# Returns exit code 0 on all passing, non-zero on any failure.
+
+set -uo pipefail
+
+# Parse arguments
+SKIP_CHECK=false
+TESTS_ONLY=false
+TEST_FILTER=""
+TARGET_REPO=""
+NO_LINT=false
+NO_TYPECHECK=false
+FAST_MODE=false
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --skip-check)
+            SKIP_CHECK=true
+            shift
+            ;;
+        --tests-only)
+            TESTS_ONLY=true
+            shift
+            ;;
+        --filter)
+            TEST_FILTER="$2"
+            shift 2
+            ;;
+        --repo)
+            TARGET_REPO="$2"
+            shift 2
+            ;;
+        --no-lint)
+            NO_LINT=true
+            shift
+            ;;
+        --no-typecheck)
+            NO_TYPECHECK=true
+            shift
+            ;;
+        --fast)
+            FAST_MODE=true
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: check.sh [--skip-check] [--tests-only] [--filter PATTERN] [--repo REPO] [--no-lint] [--no-typecheck] [--fast]"
+            exit 1
+            ;;
+    esac
+done
+
+# Handle --skip-check flag
+if $SKIP_CHECK; then
+    echo "Quality checks skipped by --skip-check flag"
+    echo ""
+    echo "WARNING: Skipping checks is for emergencies only."
+    echo "Ensure checks pass before merging PR."
+    exit 0
+fi
+
+# Handle --tests-only (implies no-lint and no-typecheck)
+if $TESTS_ONLY; then
+    NO_LINT=true
+    NO_TYPECHECK=true
+fi
+
+# Colors (if terminal supports them)
+if [[ -t 1 ]]; then
+    RED='\033[0;31m'
+    GREEN='\033[0;32m'
+    YELLOW='\033[0;33m'
+    CYAN='\033[0;36m'
+    NC='\033[0m' # No Color
+else
+    RED=''
+    GREEN=''
+    YELLOW=''
+    CYAN=''
+    NC=''
+fi
+
+# Counters
+CHECKS_RUN=0
+CHECKS_PASSED=0
+CHECKS_FAILED=0
+CHECKS_SKIPPED=0
+
+# Find project root
+find_project_root() {
+    local dir="$PWD"
+    while [[ ! -d "$dir/.claude" ]] && [[ "$dir" != "/" ]]; do
+        dir="$(dirname "$dir")"
+    done
+    if [[ -d "$dir/.claude" ]]; then
+        echo "$dir"
+    else
+        echo "$PWD"  # Fall back to current directory
+    fi
+}
+
+PROJECT_ROOT="$(find_project_root)"
+
+# Load repo configuration if available (repo-utils.sh is zsh, call via zsh subshell)
+REPO_UTILS="$PROJECT_ROOT/.pennyfarthing/scripts/repo-utils.sh"
+REPO_CONFIG_AVAILABLE=false
+if [[ -f "$REPO_UTILS" ]] && command -v zsh &>/dev/null; then
+    REPO_CONFIG_AVAILABLE=true
+fi
+
+# Helper to call repo-utils functions via zsh
+repo_util() {
+    local func="$1"
+    shift
+    if $REPO_CONFIG_AVAILABLE; then
+        zsh -c "source '$REPO_UTILS' && $func $*" 2>/dev/null || echo ""
+    else
+        echo ""
+    fi
+}
+
+# Handle --repo: change to repo subdirectory and load config
+if [[ -n "$TARGET_REPO" ]]; then
+    if $REPO_CONFIG_AVAILABLE; then
+        # Check if repo exists in config
+        REPO_EXISTS=$(repo_util "repo_exists '$TARGET_REPO' && echo yes || echo no")
+        if [[ "$REPO_EXISTS" == "yes" ]]; then
+            # Use repo config for path
+            REPO_PATH_FROM_CONFIG=$(repo_util "get_repo_path '$TARGET_REPO'")
+            if [[ "$REPO_PATH_FROM_CONFIG" == "." ]]; then
+                REPO_PATH="$PROJECT_ROOT"
+            else
+                REPO_PATH="$PROJECT_ROOT/$REPO_PATH_FROM_CONFIG"
+            fi
+            # Get commands from config
+            REPO_LINT_CMD=$(repo_util "get_lint_command '$TARGET_REPO'")
+            REPO_TEST_CMD=$(repo_util "get_test_command '$TARGET_REPO'")
+            REPO_TEST_FILTER_FLAG=$(repo_util "get_test_filter_flag '$TARGET_REPO'")
+            REPO_LANGUAGE=$(repo_util "get_repo_language '$TARGET_REPO'")
+        else
+            # Repo not in config, use directory-based approach
+            REPO_PATH="$PROJECT_ROOT/$TARGET_REPO"
+            REPO_LINT_CMD=""
+            REPO_TEST_CMD=""
+            REPO_TEST_FILTER_FLAG=""
+            REPO_LANGUAGE=""
+        fi
+    else
+        # No config available, use directory-based approach
+        REPO_PATH="$PROJECT_ROOT/$TARGET_REPO"
+        REPO_LINT_CMD=""
+        REPO_TEST_CMD=""
+        REPO_TEST_FILTER_FLAG=""
+        REPO_LANGUAGE=""
+    fi
+
+    if [[ ! -d "$REPO_PATH" ]]; then
+        echo "Error: Repo directory not found: $REPO_PATH"
+        exit 1
+    fi
+    cd "$REPO_PATH"
+    WORKING_DIR="$REPO_PATH"
+else
+    cd "$PROJECT_ROOT"
+    WORKING_DIR="$PROJECT_ROOT"
+    REPO_LINT_CMD=""
+    REPO_TEST_CMD=""
+    REPO_TEST_FILTER_FLAG=""
+    REPO_LANGUAGE=""
+fi
+
+# Output helpers
+pass() {
+    echo -e "  ${GREEN}[PASS]${NC} $1"
+    ((CHECKS_PASSED++))
+    ((CHECKS_RUN++))
+}
+
+fail() {
+    echo -e "  ${RED}[FAIL]${NC} $1"
+    ((CHECKS_FAILED++))
+    ((CHECKS_RUN++))
+}
+
+skip() {
+    echo -e "  ${YELLOW}[SKIP]${NC} $1"
+    ((CHECKS_SKIPPED++))
+}
+
+section() {
+    echo ""
+    echo -e "${CYAN}$1${NC}"
+    echo "$(printf '=%.0s' {1..40})"
+}
+
+# Detect project type
+detect_project_type() {
+    # Check for actual source files first (not just build config)
+    # This handles monorepos with multiple languages
+    if [[ -f "package.json" ]]; then
+        echo "node"
+    elif find . -maxdepth 1 -name "*.go" -type f 2>/dev/null | grep -q .; then
+        echo "go"
+    elif [[ -f "go.mod" ]]; then
+        echo "go"
+    else
+        echo "unknown"
+    fi
+}
+
+# Check if justfile has a recipe
+has_just_recipe() {
+    local recipe="$1"
+    if [[ -f "justfile" ]] && command -v just &>/dev/null; then
+        just --list 2>/dev/null | grep -q "^$recipe " && return 0
+    fi
+    return 1
+}
+
+# Check if npm script exists
+has_npm_script() {
+    local script="$1"
+    if [[ -f "package.json" ]]; then
+        grep -q "\"$script\":" package.json && return 0
+    fi
+    return 1
+}
+
+# Run a check command and report result
+run_check() {
+    local name="$1"
+    shift
+    local cmd="$*"
+
+    if eval "$cmd" >/dev/null 2>&1; then
+        pass "$name"
+        return 0
+    else
+        fail "$name"
+        return 1
+    fi
+}
+
+echo ""
+echo "Quality Gate Check"
+echo "=================="
+echo "Project: $PROJECT_ROOT"
+if [[ -n "$TARGET_REPO" ]]; then
+    echo "Repo: $TARGET_REPO"
+fi
+echo "Working dir: $WORKING_DIR"
+if $FAST_MODE; then
+    echo -e "${YELLOW}Mode: FAST (skipping slow packages)${NC}"
+fi
+
+PROJECT_TYPE=$(detect_project_type)
+
+# =============================================================================
+# Lint Check
+# =============================================================================
+section "Lint"
+
+LINT_RAN=false
+
+if $NO_LINT; then
+    skip "Lint - skipped by --no-lint or --tests-only"
+    LINT_RAN=true  # Mark as "ran" to avoid double skip message
+# Use repo config lint command if available
+elif [[ -n "$REPO_LINT_CMD" ]]; then
+    LINT_RAN=true
+    if eval "$REPO_LINT_CMD" >/dev/null 2>&1; then
+        pass "Lint ($REPO_LINT_CMD)"
+    else
+        fail "Lint ($REPO_LINT_CMD)"
+    fi
+# Prefer justfile recipes
+elif has_just_recipe "lint"; then
+    LINT_RAN=true
+    if just lint >/dev/null 2>&1; then
+        pass "Lint (just lint)"
+    else
+        fail "Lint (just lint)"
+    fi
+elif [[ "$PROJECT_TYPE" == "node" ]] && has_npm_script "lint"; then
+    LINT_RAN=true
+    if npm run lint >/dev/null 2>&1; then
+        pass "Lint (npm run lint)"
+    else
+        fail "Lint (npm run lint)"
+    fi
+elif [[ "$PROJECT_TYPE" == "go" ]] && command -v golangci-lint &>/dev/null; then
+    LINT_RAN=true
+    if golangci-lint run >/dev/null 2>&1; then
+        pass "Lint (golangci-lint)"
+    else
+        fail "Lint (golangci-lint)"
+    fi
+elif [[ -f "node_modules/.bin/eslint" ]]; then
+    LINT_RAN=true
+    if ./node_modules/.bin/eslint . >/dev/null 2>&1; then
+        pass "Lint (eslint)"
+    else
+        fail "Lint (eslint)"
+    fi
+fi
+
+if ! $LINT_RAN; then
+    skip "Lint - no lint command configured"
+fi
+
+# =============================================================================
+# Type Check
+# =============================================================================
+section "Type Check"
+
+TYPECHECK_RAN=false
+
+if $NO_TYPECHECK; then
+    skip "Type Check - skipped by --no-typecheck or --tests-only"
+    TYPECHECK_RAN=true  # Mark as "ran" to avoid double skip message
+# Prefer justfile recipes
+elif has_just_recipe "typecheck"; then
+    TYPECHECK_RAN=true
+    if just typecheck >/dev/null 2>&1; then
+        pass "Type Check (just typecheck)"
+    else
+        fail "Type Check (just typecheck)"
+    fi
+elif [[ -f "tsconfig.json" ]] && has_npm_script "typecheck"; then
+    TYPECHECK_RAN=true
+    if npm run typecheck >/dev/null 2>&1; then
+        pass "Type Check (npm run typecheck)"
+    else
+        fail "Type Check (npm run typecheck)"
+    fi
+elif [[ -f "tsconfig.json" ]] && command -v tsc &>/dev/null; then
+    TYPECHECK_RAN=true
+    if tsc --noEmit >/dev/null 2>&1; then
+        pass "Type Check (tsc --noEmit)"
+    else
+        fail "Type Check (tsc --noEmit)"
+    fi
+elif [[ -f "tsconfig.json" ]] && [[ -f "node_modules/.bin/tsc" ]]; then
+    TYPECHECK_RAN=true
+    if ./node_modules/.bin/tsc --noEmit >/dev/null 2>&1; then
+        pass "Type Check (./node_modules/.bin/tsc --noEmit)"
+    else
+        fail "Type Check (./node_modules/.bin/tsc --noEmit)"
+    fi
+fi
+
+if ! $TYPECHECK_RAN; then
+    if [[ -f "tsconfig.json" ]]; then
+        skip "Type Check - TypeScript found but no typecheck command"
+    else
+        skip "Type Check - not a TypeScript project"
+    fi
+fi
+
+# =============================================================================
+# Tests
+# =============================================================================
+section "Tests"
+
+TESTS_RAN=false
+
+# Show filter if provided
+if [[ -n "$TEST_FILTER" ]]; then
+    echo "  Filter: $TEST_FILTER"
+fi
+
+# Use repo config test command if available
+if [[ -n "$REPO_TEST_CMD" ]]; then
+    TESTS_RAN=true
+    TEST_CMD="$REPO_TEST_CMD"
+    if [[ -n "$TEST_FILTER" ]] && [[ -n "$REPO_TEST_FILTER_FLAG" ]]; then
+        TEST_CMD="$REPO_TEST_CMD $REPO_TEST_FILTER_FLAG \"$TEST_FILTER\""
+    fi
+    if eval "$TEST_CMD" >/dev/null 2>&1; then
+        pass "Tests ($REPO_TEST_CMD${TEST_FILTER:+ $REPO_TEST_FILTER_FLAG $TEST_FILTER})"
+    else
+        fail "Tests ($REPO_TEST_CMD${TEST_FILTER:+ $REPO_TEST_FILTER_FLAG $TEST_FILTER})"
+    fi
+# Prefer justfile recipes
+elif has_just_recipe "test"; then
+    TESTS_RAN=true
+    TEST_CMD="just test"
+    if [[ -n "$TEST_FILTER" ]]; then
+        # Pass filter to just test (assumes it accepts a pattern arg)
+        TEST_CMD="just test $TEST_FILTER"
+    fi
+    if eval "$TEST_CMD" >/dev/null 2>&1; then
+        pass "Tests (just test${TEST_FILTER:+ $TEST_FILTER})"
+    else
+        fail "Tests (just test${TEST_FILTER:+ $TEST_FILTER})"
+    fi
+elif [[ "$PROJECT_TYPE" == "node" ]] && has_npm_script "test"; then
+    TESTS_RAN=true
+    # Check for pnpm workspace (monorepo)
+    if [[ -f "pnpm-workspace.yaml" ]] && command -v pnpm &>/dev/null; then
+        if $FAST_MODE; then
+            # Skip slow packages (cyclist has Electron dependencies)
+            TEST_CMD="pnpm -r --filter '!@pennyfarthing/cyclist' test"
+            TEST_LABEL="pnpm test (fast mode - skipping cyclist)"
+        else
+            TEST_CMD="pnpm -r test"
+            TEST_LABEL="pnpm test"
+        fi
+    else
+        TEST_CMD="npm test"
+        TEST_LABEL="npm test"
+    fi
+    if [[ -n "$TEST_FILTER" ]]; then
+        # Pass filter to test runner (vitest/jest use -t for pattern)
+        TEST_CMD="$TEST_CMD -- -t \"$TEST_FILTER\""
+        TEST_LABEL="$TEST_LABEL -t $TEST_FILTER"
+    fi
+    if eval "$TEST_CMD" >/dev/null 2>&1; then
+        pass "Tests ($TEST_LABEL)"
+    else
+        fail "Tests ($TEST_LABEL)"
+    fi
+elif [[ "$PROJECT_TYPE" == "go" ]]; then
+    TESTS_RAN=true
+    TEST_CMD="go test ./..."
+    if [[ -n "$TEST_FILTER" ]]; then
+        # Go uses -run for pattern matching
+        TEST_CMD="go test -run \"$TEST_FILTER\" ./..."
+    fi
+    if eval "$TEST_CMD" >/dev/null 2>&1; then
+        pass "Tests (go test${TEST_FILTER:+ -run $TEST_FILTER} ./...)"
+    else
+        fail "Tests (go test${TEST_FILTER:+ -run $TEST_FILTER} ./...)"
+    fi
+elif [[ -f "node_modules/.bin/jest" ]]; then
+    TESTS_RAN=true
+    TEST_CMD="./node_modules/.bin/jest"
+    if [[ -n "$TEST_FILTER" ]]; then
+        TEST_CMD="./node_modules/.bin/jest -t \"$TEST_FILTER\""
+    fi
+    if eval "$TEST_CMD" >/dev/null 2>&1; then
+        pass "Tests (jest${TEST_FILTER:+ -t $TEST_FILTER})"
+    else
+        fail "Tests (jest${TEST_FILTER:+ -t $TEST_FILTER})"
+    fi
+fi
+
+if ! $TESTS_RAN; then
+    skip "Tests - no test command configured"
+fi
+
+# =============================================================================
+# Summary
+# =============================================================================
+section "Summary"
+
+echo ""
+echo "Checks run:    $CHECKS_RUN"
+echo -e "Checks passed: ${GREEN}$CHECKS_PASSED${NC}"
+if [[ $CHECKS_FAILED -gt 0 ]]; then
+    echo -e "Checks failed: ${RED}$CHECKS_FAILED${NC}"
+else
+    echo "Checks failed: $CHECKS_FAILED"
+fi
+if [[ $CHECKS_SKIPPED -gt 0 ]]; then
+    echo -e "Checks skipped: ${YELLOW}$CHECKS_SKIPPED${NC}"
+fi
+echo ""
+
+if [[ $CHECKS_FAILED -gt 0 ]]; then
+    echo -e "${RED}FAILED${NC} - $CHECKS_FAILED check(s) failed"
+    echo "Fix issues before handoff to Reviewer."
+    exit 1
+elif [[ $CHECKS_RUN -eq 0 ]]; then
+    echo -e "${YELLOW}WARNING${NC} - No checks ran (project type: $PROJECT_TYPE)"
+    echo "Consider adding lint/test scripts to package.json or justfile."
+    exit 0
+else
+    echo -e "${GREEN}PASSED${NC} - All checks passed"
+    exit 0
+fi

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

@@ -0,0 +1,159 @@
+#!/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
+#
+# Prerequisites:
+# - Session file exists at .session/{story-id}-session.md
+# - PR is approved and mergeable
+# - Reviewer has approved (phase: finish in session)
+#
+# 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
+
+set -euo pipefail
+
+STORY_ID="${1:-}"
+DRY_RUN=false
+
+# Parse options
+for arg in "$@"; do
+  case $arg in
+    --dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+  esac
+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
+
+# PROJECT_ROOT should be set by run.sh, but find it if not
+if [[ -z "${PROJECT_ROOT:-}" ]]; then
+  d="$PWD"
+  while [[ ! -d "$d/.claude" ]] && [[ "$d" != "/" ]]; do
+    d="$(dirname "$d")"
+  done
+  PROJECT_ROOT="$d"
+fi
+
+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)
+JIRA_KEY=$(grep -E '\*\*Jira:\*\*' "$SESSION_FILE" | sed 's/.*\*\*Jira:\*\* //' | 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"