oh-my-claude-sisyphus 3.8.15 → 3.9.0

package/skills/project-session-manager/lib/providers/github.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+# PSM GitHub Provider
+
+provider_github_available() {
+    command -v gh &> /dev/null
+}
+
+provider_github_detect_ref() {
+    local ref="$1"
+    # Matches github URLs or owner/repo#num patterns
+    [[ "$ref" =~ ^https://github\.com/ ]] || [[ "$ref" =~ ^[a-zA-Z0-9_-]+/[a-zA-Z0-9_.-]+#[0-9]+$ ]]
+}
+
+provider_github_fetch_pr() {
+    local pr_number="$1"
+    local repo="$2"
+    gh pr view "$pr_number" --repo "$repo" --json number,title,author,headRefName,baseRefName,body,url 2>/dev/null
+}
+
+provider_github_fetch_issue() {
+    local issue_number="$1"
+    local repo="$2"
+    gh issue view "$issue_number" --repo "$repo" --json number,title,body,labels,url 2>/dev/null
+}
+
+provider_github_pr_merged() {
+    local pr_number="$1"
+    local repo="$2"
+    local merged
+    merged=$(gh pr view "$pr_number" --repo "$repo" --json merged 2>/dev/null | jq -r '.merged')
+    [[ "$merged" == "true" ]]
+}
+
+provider_github_issue_closed() {
+    local issue_number="$1"
+    local repo="$2"
+    local closed
+    closed=$(gh issue view "$issue_number" --repo "$repo" --json closed 2>/dev/null | jq -r '.closed')
+    [[ "$closed" == "true" ]]
+}
+
+provider_github_clone_url() {
+    local repo="$1"
+
+    # Validate owner/repo format
+    if [[ ! "$repo" =~ ^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$ ]]; then
+        echo "error|Invalid repository format: $repo" >&2
+        return 1
+    fi
+
+    echo "https://github.com/${repo}.git"
+}

package/skills/project-session-manager/lib/providers/interface.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+# PSM Provider Interface
+# Each provider implements: _available, _detect_ref, _fetch_issue, _issue_closed,
+#                          _fetch_pr (optional), _pr_merged (optional), _clone_url
+
+# List available providers
+provider_list() {
+    echo "github jira"
+}
+
+# Allowlist of valid providers
+readonly VALID_PROVIDERS="github jira"
+
+# Check if a provider is available (CLI installed)
+# Usage: provider_available "github"
+provider_available() {
+    local provider="$1"
+
+    # Validate provider against allowlist
+    if ! echo "$VALID_PROVIDERS" | grep -qw "$provider"; then
+        echo "error|Invalid provider: $provider" >&2
+        return 1
+    fi
+
+    "provider_${provider}_available"
+}
+
+# Dispatch to provider function
+# Usage: provider_call "github" "fetch_issue" "123" "owner/repo"
+provider_call() {
+    local provider="$1"
+    local func="$2"
+    shift 2
+
+    # Validate provider against allowlist
+    if ! echo "$VALID_PROVIDERS" | grep -qw "$provider"; then
+        echo "error|Invalid provider: $provider" >&2
+        return 1
+    fi
+
+    # Validate function name (alphanumeric and underscore only)
+    if [[ ! "$func" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+        echo "error|Invalid function name: $func" >&2
+        return 1
+    fi
+
+    "provider_${provider}_${func}" "$@"
+}
+
+# Detect provider from reference (with config validation)
+# Usage: provider_detect_from_ref "PROJ-123"
+# Returns: provider name or empty
+provider_detect_from_ref() {
+    local ref="$1"
+
+    # Check Jira pattern first (config-validated)
+    if psm_detect_jira_key "$ref" >/dev/null 2>&1; then
+        echo "jira"
+        return 0
+    fi
+
+    # GitHub URL patterns
+    if [[ "$ref" =~ ^https://github\.com/ ]]; then
+        echo "github"
+        return 0
+    fi
+
+    # owner/repo#num pattern -> GitHub
+    if [[ "$ref" =~ ^[a-zA-Z0-9_-]+/[a-zA-Z0-9_.-]+#[0-9]+$ ]]; then
+        echo "github"
+        return 0
+    fi
+
+    # Default
+    echo "github"
+}

package/skills/project-session-manager/lib/providers/jira.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+# PSM Jira Provider
+# Uses `jira` CLI (https://github.com/ankitpokhrel/jira-cli)
+
+provider_jira_available() {
+    command -v jira &> /dev/null
+}
+
+provider_jira_detect_ref() {
+    local ref="$1"
+    # Config-validated detection only
+    psm_detect_jira_key "$ref" >/dev/null 2>&1
+}
+
+provider_jira_fetch_issue() {
+    local issue_key="$1"  # e.g., "PROJ-123"
+    # Note: second arg (repo) is ignored for Jira
+    jira issue view "$issue_key" --output json 2>/dev/null
+}
+
+provider_jira_issue_closed() {
+    local issue_key="$1"
+    local status_category
+    status_category=$(jira issue view "$issue_key" --output json 2>/dev/null | jq -r '.fields.status.statusCategory.key')
+    # Jira status categories: "new", "indeterminate", "done"
+    [[ "$status_category" == "done" ]]
+}
+
+# Jira has no PRs - return error
+provider_jira_fetch_pr() {
+    echo '{"error": "Jira does not support pull requests"}' >&2
+    return 1
+}
+
+provider_jira_pr_merged() {
+    return 1  # Always false - Jira has no PRs
+}
+
+provider_jira_clone_url() {
+    local alias="$1"
+    # For Jira, we need to get clone_url from config
+    # First try explicit clone_url, then fall back to repo as GitHub
+    local clone_url
+    clone_url=$(psm_get_project_clone_url "$alias")
+    if [[ -n "$clone_url" ]]; then
+        echo "$clone_url"
+        return 0
+    fi
+
+    local repo
+    repo=$(psm_get_project_repo "$alias")
+    if [[ -n "$repo" ]]; then
+        echo "https://github.com/${repo}.git"
+        return 0
+    fi
+
+    echo "error: No clone_url or repo configured for alias '$alias'" >&2
+    return 1
+}
+
+# Parse Jira reference into components
+# Input: "PROJ-123" or "mywork#123"
+# Output: Extended format for session creation
+provider_jira_parse_ref() {
+    local ref="$1"
+    local jira_info
+
+    # Try direct PROJ-123 pattern
+    if jira_info=$(psm_detect_jira_key "$ref"); then
+        IFS='|' read -r alias project_key issue_number <<< "$jira_info"
+        local project_info
+        project_info=$(psm_get_project "$alias")
+        IFS='|' read -r repo local_path base <<< "$project_info"
+        echo "issue|${alias}|${repo}|${issue_number}|${local_path}|${base}|jira|${project_key}-${issue_number}"
+        return 0
+    fi
+
+    return 1
+}

package/skills/project-session-manager/lib/session.sh

@@ -1,9 +1,24 @@
 #!/bin/bash
 # PSM Session Registry Management
 
-# Add session to registry
-# Usage: psm_add_session <id> <type> <project> <ref> <branch> <base> <tmux> <worktree> <source_repo> <metadata_json>
-psm_add_session() {
+# Lock file for atomic registry operations
+PSM_LOCK_FILE="${PSM_DATA_DIR:-.psm}/.psm-lock"
+
+# Wrapper for atomic operations with file locking
+# Usage: psm_with_lock <command> [args...]
+psm_with_lock() {
+    local timeout="${PSM_LOCK_TIMEOUT:-5}"
+    (
+        flock -w "$timeout" 200 || {
+            echo "error|Failed to acquire lock after ${timeout}s" >&2
+            return 1
+        }
+        "$@"
+    ) 200>"$PSM_LOCK_FILE"
+}
+
+# Internal: Add session to registry (must be called via psm_with_lock)
+_psm_add_session_impl() {
     local id="$1"
     local type="$2"
     local project="$3"
@@ -14,6 +29,8 @@ psm_add_session() {
     local worktree="$8"
     local source_repo="$9"
     local metadata="${10:-{}}"
+    local provider="${11:-github}"
+    local provider_ref="${12:-}"
 
     local now=$(date -Iseconds)
 
@@ -28,6 +45,8 @@ psm_add_session() {
        --arg worktree "$worktree" \
        --arg source "$source_repo" \
        --arg now "$now" \
+       --arg provider "$provider" \
+       --arg provider_ref "$provider_ref" \
        --argjson meta "$metadata" \
        '.sessions[$id] = {
           "id": $id,
@@ -42,21 +61,28 @@ psm_add_session() {
           "created_at": $now,
           "last_accessed": $now,
           "state": "active",
+          "provider": $provider,
+          "provider_ref": $provider_ref,
           "metadata": $meta
         } | .stats.total_created += 1' \
        "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
 }
 
+# Add session to registry (with file locking)
+# Usage: psm_add_session <id> <type> <project> <ref> <branch> <base> <tmux> <worktree> <source_repo> <metadata_json> [provider] [provider_ref]
+psm_add_session() {
+    psm_with_lock _psm_add_session_impl "$@"
+}
+
 # Get session by ID
 # Usage: psm_get_session <id>
 psm_get_session() {
     local id="$1"
-    jq -r ".sessions[\"$id\"] // empty" "$PSM_SESSIONS"
+    jq -r --arg i "$id" '.sessions[$i] // empty' "$PSM_SESSIONS"
 }
 
-# Update session state
-# Usage: psm_update_session_state <id> <state>
-psm_update_session_state() {
+# Internal: Update session state (must be called via psm_with_lock)
+_psm_update_session_state_impl() {
     local id="$1"
     local state="$2"
     local now=$(date -Iseconds)
@@ -69,9 +95,14 @@ psm_update_session_state() {
        "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
 }
 
-# Remove session from registry
-# Usage: psm_remove_session <id>
-psm_remove_session() {
+# Update session state (with file locking)
+# Usage: psm_update_session_state <id> <state>
+psm_update_session_state() {
+    psm_with_lock _psm_update_session_state_impl "$@"
+}
+
+# Internal: Remove session from registry (must be called via psm_with_lock)
+_psm_remove_session_impl() {
     local id="$1"
 
     local tmp=$(mktemp)
@@ -80,13 +111,19 @@ psm_remove_session() {
        "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
 }
 
+# Remove session from registry (with file locking)
+# Usage: psm_remove_session <id>
+psm_remove_session() {
+    psm_with_lock _psm_remove_session_impl "$@"
+}
+
 # List all sessions
 # Usage: psm_list_sessions [project]
 psm_list_sessions() {
     local project="$1"
 
     if [[ -n "$project" ]]; then
-        jq -r ".sessions | to_entries[] | select(.value.project == \"$project\") | .value | \"\(.id)|\(.type)|\(.state)|\(.worktree)\"" "$PSM_SESSIONS"
+        jq -r --arg p "$project" '.sessions | to_entries[] | select(.value.project == $p) | .value | "\(.id)|\(.type)|\(.state)|\(.worktree)"' "$PSM_SESSIONS"
     else
         jq -r '.sessions | to_entries[] | .value | "\(.id)|\(.type)|\(.state)|\(.worktree)"' "$PSM_SESSIONS"
     fi
@@ -95,7 +132,7 @@ psm_list_sessions() {
 # Get sessions by state
 psm_get_sessions_by_state() {
     local state="$1"
-    jq -r ".sessions | to_entries[] | select(.value.state == \"$state\") | .value.id" "$PSM_SESSIONS"
+    jq -r --arg s "$state" '.sessions | to_entries[] | select(.value.state == $s) | .value.id' "$PSM_SESSIONS"
 }
 
 # Get session count

package/skills/project-session-manager/lib/worktree.sh

@@ -1,6 +1,32 @@
 #!/bin/bash
 # PSM Worktree Management
 
+# Validate worktree path is under PSM worktree root before deletion
+# Returns 0 if valid, 1 if invalid
+# Usage: validate_worktree_path <path>
+validate_worktree_path() {
+    local path="$1"
+    local worktree_root
+    worktree_root=$(psm_get_worktree_root 2>/dev/null) || return 1
+
+    # Path must exist and be a directory
+    if [[ ! -d "$path" ]]; then
+        return 1
+    fi
+
+    # Resolve to absolute paths for comparison
+    local abs_path abs_root
+    abs_path=$(cd "$path" 2>/dev/null && pwd) || return 1
+    abs_root=$(cd "$worktree_root" 2>/dev/null && pwd) || return 1
+
+    # Check path is under root and doesn't contain ..
+    if [[ "$abs_path" != "$abs_root"/* ]] || [[ "$path" == *".."* ]]; then
+        echo "error|Invalid worktree path: not under PSM root" >&2
+        return 1
+    fi
+    return 0
+}
+
 # Create a worktree for PR review
 # Usage: psm_create_pr_worktree <local_repo> <alias> <pr_number> <pr_branch>
 psm_create_pr_worktree() {
@@ -146,10 +172,17 @@ psm_remove_worktree() {
     fi
 
     cd "$local_repo" || return 1
-    git worktree remove "$worktree_path" --force 2>/dev/null || {
-        # Force remove the directory if git worktree remove fails
-        rm -rf "$worktree_path"
-    }
+
+    # Validate path is under PSM worktree root before any deletion
+    if validate_worktree_path "$worktree_path"; then
+        git worktree remove "$worktree_path" --force 2>/dev/null || {
+            # Force remove the directory if git worktree remove fails
+            rm -rf "$worktree_path"
+        }
+    else
+        echo "error|Refusing to delete path outside worktree root: $worktree_path" >&2
+        return 1
+    fi
 
     echo "removed|$worktree_path"
     return 0

package/skills/project-session-manager/psm.sh

@@ -13,6 +13,11 @@ source "$SCRIPT_DIR/lib/worktree.sh"
 source "$SCRIPT_DIR/lib/tmux.sh"
 source "$SCRIPT_DIR/lib/session.sh"
 
+# Source provider files
+source "$SCRIPT_DIR/lib/providers/interface.sh"
+source "$SCRIPT_DIR/lib/providers/github.sh"
+source "$SCRIPT_DIR/lib/providers/jira.sh"
+
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -38,15 +43,14 @@ check_dependencies() {
         missing+=("jq")
     fi
 
-    if ! command -v gh &> /dev/null; then
-        missing+=("gh (GitHub CLI)")
-    fi
+    # Note: gh and jira are checked per-operation, not globally
+    # This allows users without gh to still use Jira, and vice versa
 
     if [[ ${#missing[@]} -gt 0 ]]; then
         log_error "Missing required dependencies: ${missing[*]}"
         log_info "Install with:"
-        log_info "  Ubuntu/Debian: sudo apt install git jq gh"
-        log_info "  macOS: brew install git jq gh"
+        log_info "  Ubuntu/Debian: sudo apt install git jq"
+        log_info "  macOS: brew install git jq"
         exit 1
     fi
 
@@ -106,7 +110,21 @@ cmd_review() {
         return 1
     fi
 
-    IFS='|' read -r type alias repo pr_number local_path base <<< "$parsed"
+    IFS='|' read -r type alias repo pr_number local_path base provider provider_ref <<< "$parsed"
+
+    # Provider guard: Jira doesn't have PRs
+    if [[ "$provider" == "jira" ]]; then
+        log_error "Jira issues cannot be 'reviewed' - Jira has no PR concept."
+        log_info "Use 'psm fix $ref' to work on a Jira issue instead."
+        log_info "Jira integration supports: fix, feature"
+        return 1
+    fi
+
+    # Check GitHub CLI availability
+    if ! provider_github_available; then
+        log_error "GitHub CLI (gh) not found. Install: brew install gh"
+        return 1
+    fi
 
     if [[ -z "$repo" ]]; then
         log_error "Could not determine repository"
@@ -117,7 +135,7 @@ cmd_review() {
 
     # Fetch PR info
     local pr_info
-    pr_info=$(gh pr view "$pr_number" --repo "$repo" --json number,title,author,headRefName,baseRefName,body,url 2>/dev/null) || {
+    pr_info=$(provider_call "github" fetch_pr "$pr_number" "$repo") || {
         log_error "Failed to fetch PR #${pr_number}. Check if the PR exists and you have access."
         return 1
     }
@@ -143,7 +161,9 @@ cmd_review() {
         local_path="${HOME}/Workspace/$(basename "$repo")"
         if [[ ! -d "$local_path" ]]; then
             log_info "Cloning repository to $local_path..."
-            git clone "https://github.com/${repo}.git" "$local_path" || {
+            local clone_url
+            clone_url=$(provider_call "github" clone_url "$repo")
+            git clone "$clone_url" "$local_path" || {
                 log_error "Failed to clone repository"
                 return 1
             }
@@ -198,18 +218,16 @@ cmd_review() {
     fi
 
     # Create session metadata
-    local metadata=$(cat << EOF
-{
-  "pr_number": $pr_number,
-  "pr_title": $(echo "$pr_title" | jq -R .),
-  "pr_author": "$pr_author",
-  "pr_url": "$pr_url"
-}
-EOF
-)
+    local metadata
+    metadata=$(jq -n \
+      --argjson pr_number "$pr_number" \
+      --arg pr_title "$pr_title" \
+      --arg pr_author "$pr_author" \
+      --arg pr_url "$pr_url" \
+      '{pr_number: $pr_number, pr_title: $pr_title, pr_author: $pr_author, pr_url: $pr_url}')
 
     # Add to registry
-    psm_add_session "$session_id" "review" "$alias" "pr-${pr_number}" "$head_branch" "$base_branch" "$session_name" "$worktree_path" "$local_path" "$metadata"
+    psm_add_session "$session_id" "review" "$alias" "pr-${pr_number}" "$head_branch" "$base_branch" "$session_name" "$worktree_path" "$local_path" "$metadata" "github" "${repo}#${pr_number}"
 
     # Output summary
     echo ""
@@ -242,24 +260,45 @@ cmd_fix() {
         return 1
     fi
 
-    IFS='|' read -r type alias repo issue_number local_path base <<< "$parsed"
+    IFS='|' read -r type alias repo issue_number local_path base provider provider_ref <<< "$parsed"
 
-    if [[ -z "$repo" ]]; then
+    # Check provider CLI availability
+    if [[ "$provider" == "jira" ]]; then
+        if ! provider_jira_available; then
+            log_error "Jira CLI not found. Install: brew install ankitpokhrel/jira-cli/jira-cli"
+            return 1
+        fi
+    else
+        if ! provider_github_available; then
+            log_error "GitHub CLI (gh) not found. Install: brew install gh"
+            return 1
+        fi
+    fi
+
+    if [[ -z "$repo" && "$provider" != "jira" ]]; then
         log_error "Could not determine repository"
         return 1
     fi
 
-    log_info "Fetching issue #${issue_number} from ${repo}..."
+    log_info "Fetching issue #${issue_number}..."
 
     # Fetch issue info
     local issue_info
-    issue_info=$(gh issue view "$issue_number" --repo "$repo" --json number,title,body,labels,url 2>/dev/null) || {
-        log_error "Failed to fetch issue #${issue_number}"
-        return 1
-    }
-
-    local issue_title=$(echo "$issue_info" | jq -r '.title')
-    local issue_url=$(echo "$issue_info" | jq -r '.url')
+    if [[ "$provider" == "jira" ]]; then
+        issue_info=$(provider_call "jira" fetch_issue "$provider_ref") || {
+            log_error "Failed to fetch Jira issue ${provider_ref}"
+            return 1
+        }
+        local issue_title=$(echo "$issue_info" | jq -r '.fields.summary')
+        local issue_url=$(echo "$issue_info" | jq -r '.self // empty')
+    else
+        issue_info=$(provider_call "github" fetch_issue "$issue_number" "$repo") || {
+            log_error "Failed to fetch issue #${issue_number}"
+            return 1
+        }
+        local issue_title=$(echo "$issue_info" | jq -r '.title')
+        local issue_url=$(echo "$issue_info" | jq -r '.url')
+    fi
     local slug=$(psm_slugify "$issue_title" 20)
 
     log_info "Issue: #${issue_number} - ${issue_title}"
@@ -271,10 +310,19 @@ cmd_fix() {
 
     # Determine local path
     if [[ -z "$local_path" || ! -d "$local_path" ]]; then
-        local_path="${HOME}/Workspace/$(basename "$repo")"
+        local_path="${HOME}/Workspace/$(basename "${repo:-$alias}")"
         if [[ ! -d "$local_path" ]]; then
             log_info "Cloning repository..."
-            git clone "https://github.com/${repo}.git" "$local_path" || return 1
+            local clone_url
+            if [[ "$provider" == "jira" ]]; then
+                clone_url=$(provider_call "jira" clone_url "$alias") || {
+                    log_error "Failed to get clone URL for '$alias'. Configure 'repo' or 'clone_url' in projects.json"
+                    return 1
+                }
+            else
+                clone_url=$(provider_call "github" clone_url "$repo")
+            fi
+            git clone "$clone_url" "$local_path" || return 1
         fi
     fi
 
@@ -309,16 +357,14 @@ cmd_fix() {
     fi
 
     # Create metadata
-    local metadata=$(cat << EOF
-{
-  "issue_number": $issue_number,
-  "issue_title": $(echo "$issue_title" | jq -R .),
-  "issue_url": "$issue_url"
-}
-EOF
-)
+    local metadata
+    metadata=$(jq -n \
+      --argjson issue_number "$issue_number" \
+      --arg issue_title "$issue_title" \
+      --arg issue_url "$issue_url" \
+      '{issue_number: $issue_number, issue_title: $issue_title, issue_url: $issue_url}')
 
-    psm_add_session "$session_id" "fix" "$alias" "issue-${issue_number}" "$branch_name" "$base" "$session_name" "$worktree_path" "$local_path" "$metadata"
+    psm_add_session "$session_id" "fix" "$alias" "issue-${issue_number}" "$branch_name" "$base" "$session_name" "$worktree_path" "$local_path" "$metadata" "$provider" "$provider_ref"
 
     echo ""
     log_success "Session ready!"
@@ -473,15 +519,20 @@ cmd_cleanup() {
 
     local cleaned=0
 
-    # Check PR sessions (use process substitution to avoid subshell)
+    # Check PR sessions (GitHub only)
     while IFS='|' read -r id pr_number project; do
         if [[ -z "$id" ]]; then continue; fi
 
+        local session_json=$(psm_get_session "$id")
+        local provider=$(echo "$session_json" | jq -r '.provider // "github"')
+
+        # Only GitHub has PRs
+        if [[ "$provider" != "github" ]]; then continue; fi
+
         local repo=$(psm_get_project "$project" | cut -d'|' -f1)
 
         if [[ -n "$repo" && -n "$pr_number" ]]; then
-            local pr_state=$(gh pr view "$pr_number" --repo "$repo" --json merged 2>/dev/null | jq -r '.merged')
-            if [[ "$pr_state" == "true" ]]; then
+            if provider_github_available && provider_call "github" pr_merged "$pr_number" "$repo"; then
                 log_info "PR #${pr_number} is merged - cleaning up $id"
                 cmd_kill "$id"
                 ((cleaned++))
@@ -489,18 +540,32 @@ cmd_cleanup() {
         fi
     done < <(psm_get_review_sessions)
 
-    # Check issue sessions (use process substitution to avoid subshell)
+    # Check issue sessions (GitHub and Jira)
     while IFS='|' read -r id issue_number project; do
         if [[ -z "$id" ]]; then continue; fi
 
-        local repo=$(psm_get_project "$project" | cut -d'|' -f1)
-
-        if [[ -n "$repo" && -n "$issue_number" ]]; then
-            local issue_state=$(gh issue view "$issue_number" --repo "$repo" --json closed 2>/dev/null | jq -r '.closed')
-            if [[ "$issue_state" == "true" ]]; then
-                log_info "Issue #${issue_number} is closed - cleaning up $id"
-                cmd_kill "$id"
-                ((cleaned++))
+        local session_json=$(psm_get_session "$id")
+        local provider=$(echo "$session_json" | jq -r '.provider // "github"')
+        local provider_ref=$(echo "$session_json" | jq -r '.provider_ref // empty')
+
+        if [[ "$provider" == "jira" ]]; then
+            # Jira cleanup
+            if provider_jira_available && [[ -n "$provider_ref" ]]; then
+                if provider_call "jira" issue_closed "$provider_ref"; then
+                    log_info "Jira issue ${provider_ref} is done - cleaning up $id"
+                    cmd_kill "$id"
+                    ((cleaned++))
+                fi
+            fi
+        else
+            # GitHub cleanup
+            local repo=$(psm_get_project "$project" | cut -d'|' -f1)
+            if provider_github_available && [[ -n "$repo" && -n "$issue_number" ]]; then
+                if provider_call "github" issue_closed "$issue_number" "$repo"; then
+                    log_info "Issue #${issue_number} is closed - cleaning up $id"
+                    cmd_kill "$id"
+                    ((cleaned++))
+                fi
             fi
         fi
     done < <(psm_get_fix_sessions)