oh-my-claude-sisyphus 3.8.16 → 3.9.0

package/skills/project-session-manager/SKILL.md

@@ -49,6 +49,85 @@ Supported formats:
 }
 ```
 
+## Providers
+
+PSM supports multiple issue tracking providers:
+
+| Provider | CLI Required | Reference Formats | Commands |
+|----------|--------------|-------------------|----------|
+| GitHub (default) | `gh` | `owner/repo#123`, `alias#123`, GitHub URLs | review, fix, feature |
+| Jira | `jira` | `PROJ-123` (if PROJ configured), `alias#123` | fix, feature |
+
+### Jira Configuration
+
+To use Jira, add an alias with `jira_project` and `provider: "jira"`:
+
+```json
+{
+  "aliases": {
+    "mywork": {
+      "jira_project": "MYPROJ",
+      "repo": "mycompany/my-project",
+      "local": "~/Workspace/my-project",
+      "default_base": "develop",
+      "provider": "jira"
+    }
+  }
+}
+```
+
+**Important:** The `repo` field is still required for cloning the git repository. Jira tracks issues, but you work in a git repo.
+
+For non-GitHub repos, use `clone_url` instead:
+```json
+{
+  "aliases": {
+    "private": {
+      "jira_project": "PRIV",
+      "clone_url": "git@gitlab.internal:team/repo.git",
+      "local": "~/Workspace/repo",
+      "provider": "jira"
+    }
+  }
+}
+```
+
+### Jira Reference Detection
+
+PSM only recognizes `PROJ-123` format as Jira when `PROJ` is explicitly configured as a `jira_project` in your aliases. This prevents false positives from branch names like `FIX-123`.
+
+### Jira Examples
+
+```bash
+# Fix a Jira issue (MYPROJ must be configured)
+psm fix MYPROJ-123
+
+# Fix using alias (recommended)
+psm fix mywork#123
+
+# Feature development (works same as GitHub)
+psm feature mywork add-webhooks
+
+# Note: 'psm review' is not supported for Jira (no PR concept)
+# Use 'psm fix' for Jira issues
+```
+
+### Jira CLI Setup
+
+Install the Jira CLI:
+```bash
+# macOS
+brew install ankitpokhrel/jira-cli/jira-cli
+
+# Linux
+# See: https://github.com/ankitpokhrel/jira-cli#installation
+
+# Configure (interactive)
+jira init
+```
+
+The Jira CLI handles authentication separately from PSM.
+
 ## Directory Structure
 
 ```
@@ -371,10 +450,14 @@ Parse `{{ARGUMENTS}}` to determine:
 
 ## Requirements
 
-- `git` with worktree support (v2.5+)
-- `gh` CLI (authenticated)
-- `tmux`
-- `jq` for JSON parsing
+Required:
+- `git` - Version control (with worktree support v2.5+)
+- `jq` - JSON parsing
+- `tmux` - Session management (optional, but recommended)
+
+Optional (per provider):
+- `gh` - GitHub CLI (for GitHub workflows)
+- `jira` - Jira CLI (for Jira workflows)
 
 ## Initialization
 

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

@@ -48,11 +48,12 @@ psm_get_project() {
         return 1
     fi
 
-    local repo=$(jq -r ".aliases[\"$alias\"].repo // empty" "$PSM_PROJECTS")
-    local local_path=$(jq -r ".aliases[\"$alias\"].local // empty" "$PSM_PROJECTS")
-    local default_base=$(jq -r ".aliases[\"$alias\"].default_base // \"main\"" "$PSM_PROJECTS")
+    local repo=$(jq -r --arg a "$alias" '.aliases[$a].repo // empty' "$PSM_PROJECTS")
+    local local_path=$(jq -r --arg a "$alias" '.aliases[$a].local // empty' "$PSM_PROJECTS")
+    local default_base=$(jq -r --arg a "$alias" '.aliases[$a].default_base // "main"' "$PSM_PROJECTS")
 
-    if [[ -z "$repo" ]]; then
+    local clone_url=$(jq -r --arg a "$alias" '.aliases[$a].clone_url // empty' "$PSM_PROJECTS")
+    if [[ -z "$repo" && -z "$clone_url" ]]; then
         return 1
     fi
 
@@ -62,6 +63,53 @@ psm_get_project() {
     echo "${repo}|${local_path}|${default_base}"
 }
 
+# Get provider for a project alias
+# Usage: psm_get_project_provider "mywork"
+# Returns: "github" | "jira" | empty (defaults to github)
+psm_get_project_provider() {
+    local alias="$1"
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        echo "github"
+        return
+    fi
+    local provider
+    provider=$(jq -r --arg a "$alias" '.aliases[$a].provider // "github"' "$PSM_PROJECTS")
+    echo "$provider"
+}
+
+# Get Jira project key for alias
+# Usage: psm_get_project_jira_project "mywork"
+# Returns: "MYPROJ" or empty
+psm_get_project_jira_project() {
+    local alias="$1"
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        return
+    fi
+    jq -r --arg a "$alias" '.aliases[$a].jira_project // empty' "$PSM_PROJECTS"
+}
+
+# Get explicit clone_url for alias (for non-GitHub repos)
+# Usage: psm_get_project_clone_url "mywork"
+# Returns: URL or empty
+psm_get_project_clone_url() {
+    local alias="$1"
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        return
+    fi
+    jq -r --arg a "$alias" '.aliases[$a].clone_url // empty' "$PSM_PROJECTS"
+}
+
+# Get repo field for alias
+# Usage: psm_get_project_repo "mywork"
+# Returns: "owner/repo" or empty
+psm_get_project_repo() {
+    local alias="$1"
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        return
+    fi
+    jq -r --arg a "$alias" '.aliases[$a].repo // empty' "$PSM_PROJECTS"
+}
+
 # Add or update project alias
 psm_set_project() {
     local alias="$1"
@@ -70,7 +118,8 @@ psm_set_project() {
     local default_base="${4:-main}"
 
     local tmp=$(mktemp)
-    jq ".aliases[\"$alias\"] = {\"repo\": \"$repo\", \"local\": \"$local_path\", \"default_base\": \"$default_base\"}" \
+    jq --arg a "$alias" --arg r "$repo" --arg l "$local_path" --arg b "$default_base" \
+        '.aliases[$a] = {"repo": $r, "local": $l, "default_base": $b}' \
         "$PSM_PROJECTS" > "$tmp" && mv "$tmp" "$PSM_PROJECTS"
 }
 

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

@@ -9,7 +9,7 @@
 #   #123              -> number=123 (use current repo)
 #
 # Usage: psm_parse_ref "omc#123"
-# Returns: type|alias|repo|number|local_path|base
+# Returns: type|alias|repo|number|local_path|base|provider|provider_ref
 psm_parse_ref() {
     local ref="$1"
     local type=""
@@ -29,7 +29,7 @@ psm_parse_ref() {
         if [[ -n "$alias" ]]; then
             IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
         fi
-        echo "pr|${alias:-}|$repo|$number|${local_path:-}|$base"
+        echo "pr|${alias:-}|$repo|$number|${local_path:-}|$base|github|${repo}#${number}"
         return 0
     fi
 
@@ -42,11 +42,24 @@ psm_parse_ref() {
         if [[ -n "$alias" ]]; then
             IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
         fi
-        echo "issue|${alias:-}|$repo|$number|${local_path:-}|$base"
+        echo "issue|${alias:-}|$repo|$number|${local_path:-}|$base|github|${repo}#${number}"
         return 0
     fi
 
-    # alias#number format (e.g., omc#123)
+    # Jira direct reference (PROJ-123) - config-validated
+    local jira_info
+    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")
+        if [[ $? -eq 0 ]]; then
+            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
+    fi
+
+    # alias#number format (e.g., omc#123 or mywork#123)
     if [[ "$ref" =~ ^([a-zA-Z][a-zA-Z0-9_-]*)#([0-9]+)$ ]]; then
         alias="${BASH_REMATCH[1]}"
         number="${BASH_REMATCH[2]}"
@@ -55,11 +68,22 @@ psm_parse_ref() {
         project_info=$(psm_get_project "$alias")
         if [[ $? -eq 0 ]]; then
             IFS='|' read -r repo local_path base <<< "$project_info"
-            # Determine type from context (default to issue, caller specifies)
-            echo "ref|$alias|$repo|$number|$local_path|$base"
+            local provider
+            provider=$(psm_get_project_provider "$alias")
+            local provider_ref=""
+
+            if [[ "$provider" == "jira" ]]; then
+                local jira_proj
+                jira_proj=$(psm_get_project_jira_project "$alias")
+                provider_ref="${jira_proj}-${number}"
+            else
+                provider_ref="${repo}#${number}"
+            fi
+
+            echo "ref|$alias|$repo|$number|$local_path|$base|$provider|$provider_ref"
             return 0
         else
-            echo "error|Unknown project alias: $alias|||"
+            echo "error|Unknown project alias: $alias|||||||"
             return 1
         fi
     fi
@@ -72,7 +96,7 @@ psm_parse_ref() {
         if [[ -n "$alias" ]]; then
             IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
         fi
-        echo "ref|${alias:-}|$repo|$number|${local_path:-}|$base"
+        echo "ref|${alias:-}|$repo|$number|${local_path:-}|$base|github|${repo}#${number}"
         return 0
     fi
 
@@ -88,11 +112,11 @@ psm_parse_ref() {
                 alias=$(psm_find_alias_for_repo "$repo")
             fi
         fi
-        echo "ref|${alias:-}|${repo:-}|$number|${local_path:-}|$base"
+        echo "ref|${alias:-}|${repo:-}|$number|${local_path:-}|$base|github|${repo:+${repo}#${number}}"
         return 0
     fi
 
-    echo "error|Cannot parse reference: $ref|||"
+    echo "error|Cannot parse reference: $ref||||||"
     return 1
 }
 
@@ -103,7 +127,7 @@ psm_find_alias_for_repo() {
         return 1
     fi
 
-    jq -r ".aliases | to_entries[] | select(.value.repo == \"$target_repo\") | .key" "$PSM_PROJECTS" | head -1
+    jq -r --arg r "$target_repo" '.aliases | to_entries[] | select(.value.repo == $r) | .key' "$PSM_PROJECTS" | head -1
 }
 
 # Sanitize a string for use in filenames/session names
@@ -119,3 +143,33 @@ psm_slugify() {
     local max_len="${2:-30}"
     echo "$title" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//' | sed 's/-$//' | head -c "$max_len"
 }
+
+# Check if input matches a configured Jira project
+# Usage: psm_detect_jira_key "PROJ-123"
+# Returns: alias|project_key|issue_number OR exits 1
+psm_detect_jira_key() {
+    local input="$1"
+
+    # Must match PROJ-123 pattern (uppercase project, dash, digits)
+    if [[ ! "$input" =~ ^([A-Z][A-Z0-9]*)-([0-9]+)$ ]]; then
+        return 1
+    fi
+
+    local project_prefix="${BASH_REMATCH[1]}"
+    local issue_number="${BASH_REMATCH[2]}"
+
+    # Verify this project prefix exists in config
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        return 1
+    fi
+
+    local matching_alias
+    matching_alias=$(jq -r --arg p "$project_prefix" '.aliases | to_entries[] | select(.value.jira_project == $p) | .key' "$PSM_PROJECTS" | head -1)
+
+    if [[ -n "$matching_alias" ]]; then
+        echo "${matching_alias}|${project_prefix}|${issue_number}"
+        return 0
+    fi
+
+    return 1
+}

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