oh-my-claude-sisyphus 3.6.0 → 3.6.2

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

@@ -0,0 +1,121 @@
+#!/bin/bash
+# PSM Reference Parser
+
+# Parse a reference string into components
+# Supports:
+#   omc#123           -> alias=omc, number=123
+#   owner/repo#123    -> repo=owner/repo, number=123
+#   https://...       -> parsed from URL
+#   #123              -> number=123 (use current repo)
+#
+# Usage: psm_parse_ref "omc#123"
+# Returns: type|alias|repo|number|local_path|base
+psm_parse_ref() {
+    local ref="$1"
+    local type=""
+    local alias=""
+    local repo=""
+    local number=""
+    local local_path=""
+    local base="main"
+
+    # GitHub PR URL
+    if [[ "$ref" =~ ^https://github\.com/([^/]+)/([^/]+)/pull/([0-9]+) ]]; then
+        repo="${BASH_REMATCH[1]}/${BASH_REMATCH[2]}"
+        number="${BASH_REMATCH[3]}"
+        type="pr"
+        # Try to find alias for this repo
+        alias=$(psm_find_alias_for_repo "$repo")
+        if [[ -n "$alias" ]]; then
+            IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
+        fi
+        echo "pr|${alias:-}|$repo|$number|${local_path:-}|$base"
+        return 0
+    fi
+
+    # GitHub Issue URL
+    if [[ "$ref" =~ ^https://github\.com/([^/]+)/([^/]+)/issues/([0-9]+) ]]; then
+        repo="${BASH_REMATCH[1]}/${BASH_REMATCH[2]}"
+        number="${BASH_REMATCH[3]}"
+        type="issue"
+        alias=$(psm_find_alias_for_repo "$repo")
+        if [[ -n "$alias" ]]; then
+            IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
+        fi
+        echo "issue|${alias:-}|$repo|$number|${local_path:-}|$base"
+        return 0
+    fi
+
+    # alias#number format (e.g., omc#123)
+    if [[ "$ref" =~ ^([a-zA-Z][a-zA-Z0-9_-]*)#([0-9]+)$ ]]; then
+        alias="${BASH_REMATCH[1]}"
+        number="${BASH_REMATCH[2]}"
+
+        local project_info
+        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"
+            return 0
+        else
+            echo "error|Unknown project alias: $alias|||"
+            return 1
+        fi
+    fi
+
+    # owner/repo#number format
+    if [[ "$ref" =~ ^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.-]+)#([0-9]+)$ ]]; then
+        repo="${BASH_REMATCH[1]}/${BASH_REMATCH[2]}"
+        number="${BASH_REMATCH[3]}"
+        alias=$(psm_find_alias_for_repo "$repo")
+        if [[ -n "$alias" ]]; then
+            IFS='|' read -r _ local_path base <<< "$(psm_get_project "$alias")"
+        fi
+        echo "ref|${alias:-}|$repo|$number|${local_path:-}|$base"
+        return 0
+    fi
+
+    # Just #number (use current repo)
+    if [[ "$ref" =~ ^#([0-9]+)$ ]]; then
+        number="${BASH_REMATCH[1]}"
+        # Detect repo from current directory
+        if git rev-parse --git-dir > /dev/null 2>&1; then
+            local remote_url=$(git remote get-url origin 2>/dev/null)
+            if [[ "$remote_url" =~ github\.com[:/]([^/]+)/([^/.]+) ]]; then
+                repo="${BASH_REMATCH[1]}/${BASH_REMATCH[2]}"
+                local_path=$(git rev-parse --show-toplevel)
+                alias=$(psm_find_alias_for_repo "$repo")
+            fi
+        fi
+        echo "ref|${alias:-}|${repo:-}|$number|${local_path:-}|$base"
+        return 0
+    fi
+
+    echo "error|Cannot parse reference: $ref|||"
+    return 1
+}
+
+# Find project alias for a given repo
+psm_find_alias_for_repo() {
+    local target_repo="$1"
+    if [[ ! -f "$PSM_PROJECTS" ]]; then
+        return 1
+    fi
+
+    jq -r ".aliases | to_entries[] | select(.value.repo == \"$target_repo\") | .key" "$PSM_PROJECTS" | head -1
+}
+
+# Sanitize a string for use in filenames/session names
+psm_sanitize() {
+    local input="$1"
+    # Remove path traversal, convert to lowercase, replace spaces with dashes
+    echo "$input" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g' | sed 's/--*/-/g' | head -c 30
+}
+
+# Generate a slug from title
+psm_slugify() {
+    local title="$1"
+    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"
+}

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

@@ -0,0 +1,132 @@
+#!/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() {
+    local id="$1"
+    local type="$2"
+    local project="$3"
+    local ref="$4"
+    local branch="$5"
+    local base="$6"
+    local tmux_session="$7"
+    local worktree="$8"
+    local source_repo="$9"
+    local metadata="${10:-{}}"
+
+    local now=$(date -Iseconds)
+
+    local tmp=$(mktemp)
+    jq --arg id "$id" \
+       --arg type "$type" \
+       --arg project "$project" \
+       --arg ref "$ref" \
+       --arg branch "$branch" \
+       --arg base "$base" \
+       --arg tmux "$tmux_session" \
+       --arg worktree "$worktree" \
+       --arg source "$source_repo" \
+       --arg now "$now" \
+       --argjson meta "$metadata" \
+       '.sessions[$id] = {
+          "id": $id,
+          "type": $type,
+          "project": $project,
+          "ref": $ref,
+          "branch": $branch,
+          "base": $base,
+          "tmux": $tmux,
+          "worktree": $worktree,
+          "source_repo": $source,
+          "created_at": $now,
+          "last_accessed": $now,
+          "state": "active",
+          "metadata": $meta
+        } | .stats.total_created += 1' \
+       "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
+}
+
+# Get session by ID
+# Usage: psm_get_session <id>
+psm_get_session() {
+    local id="$1"
+    jq -r ".sessions[\"$id\"] // empty" "$PSM_SESSIONS"
+}
+
+# Update session state
+# Usage: psm_update_session_state <id> <state>
+psm_update_session_state() {
+    local id="$1"
+    local state="$2"
+    local now=$(date -Iseconds)
+
+    local tmp=$(mktemp)
+    jq --arg id "$id" \
+       --arg state "$state" \
+       --arg now "$now" \
+       '.sessions[$id].state = $state | .sessions[$id].last_accessed = $now' \
+       "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
+}
+
+# Remove session from registry
+# Usage: psm_remove_session <id>
+psm_remove_session() {
+    local id="$1"
+
+    local tmp=$(mktemp)
+    jq --arg id "$id" \
+       'del(.sessions[$id]) | .stats.total_cleaned += 1' \
+       "$PSM_SESSIONS" > "$tmp" && mv "$tmp" "$PSM_SESSIONS"
+}
+
+# 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"
+    else
+        jq -r '.sessions | to_entries[] | .value | "\(.id)|\(.type)|\(.state)|\(.worktree)"' "$PSM_SESSIONS"
+    fi
+}
+
+# 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"
+}
+
+# Get session count
+psm_session_count() {
+    jq -r '.sessions | length' "$PSM_SESSIONS"
+}
+
+# Write session metadata file in worktree
+# Usage: psm_write_session_metadata <worktree_path> <session_json>
+psm_write_session_metadata() {
+    local worktree_path="$1"
+    local session_json="$2"
+
+    echo "$session_json" > "${worktree_path}/.psm-session.json"
+}
+
+# Read session metadata from worktree
+psm_read_session_metadata() {
+    local worktree_path="$1"
+    local meta_file="${worktree_path}/.psm-session.json"
+
+    if [[ -f "$meta_file" ]]; then
+        cat "$meta_file"
+    fi
+}
+
+# Get all session IDs for cleanup check
+psm_get_review_sessions() {
+    jq -r '.sessions | to_entries[] | select(.value.type == "review") | "\(.value.id)|\(.value.metadata.pr_number // empty)|\(.value.project)"' "$PSM_SESSIONS"
+}
+
+psm_get_fix_sessions() {
+    jq -r '.sessions | to_entries[] | select(.value.type == "fix") | "\(.value.id)|\(.value.metadata.issue_number // empty)|\(.value.project)"' "$PSM_SESSIONS"
+}

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

@@ -0,0 +1,103 @@
+#!/bin/bash
+# PSM Tmux Session Management
+
+# Check if tmux is available
+psm_has_tmux() {
+    command -v tmux &> /dev/null
+}
+
+# Create a tmux session
+# Usage: psm_create_tmux_session <session_name> <working_dir>
+psm_create_tmux_session() {
+    local session_name="$1"
+    local working_dir="$2"
+
+    if ! psm_has_tmux; then
+        echo "error|tmux not found"
+        return 1
+    fi
+
+    # Check if session already exists
+    if tmux has-session -t "$session_name" 2>/dev/null; then
+        echo "exists|$session_name"
+        return 1
+    fi
+
+    # Create detached session
+    tmux new-session -d -s "$session_name" -c "$working_dir" 2>/dev/null || {
+        echo "error|Failed to create tmux session"
+        return 1
+    }
+
+    echo "created|$session_name"
+    return 0
+}
+
+# Launch Claude Code in tmux session
+# Usage: psm_launch_claude <session_name>
+psm_launch_claude() {
+    local session_name="$1"
+
+    if ! tmux has-session -t "$session_name" 2>/dev/null; then
+        echo "error|Session not found: $session_name"
+        return 1
+    fi
+
+    # Send claude command to the session
+    tmux send-keys -t "$session_name" "claude" Enter
+
+    echo "launched|$session_name"
+    return 0
+}
+
+# Kill a tmux session
+# Usage: psm_kill_tmux_session <session_name>
+psm_kill_tmux_session() {
+    local session_name="$1"
+
+    if ! tmux has-session -t "$session_name" 2>/dev/null; then
+        echo "not_found|$session_name"
+        return 0
+    fi
+
+    tmux kill-session -t "$session_name" 2>/dev/null || {
+        echo "error|Failed to kill session"
+        return 1
+    }
+
+    echo "killed|$session_name"
+    return 0
+}
+
+# List all PSM tmux sessions
+psm_list_tmux_sessions() {
+    if ! psm_has_tmux; then
+        return 0
+    fi
+
+    tmux list-sessions -F "#{session_name}|#{session_created}|#{session_attached}" 2>/dev/null | grep "^psm:" || true
+}
+
+# Check if a tmux session exists
+# Usage: psm_tmux_session_exists <session_name>
+psm_tmux_session_exists() {
+    local session_name="$1"
+    tmux has-session -t "$session_name" 2>/dev/null
+}
+
+# Get current tmux session name
+psm_current_tmux_session() {
+    if [[ -n "$TMUX" ]]; then
+        tmux display-message -p "#{session_name}" 2>/dev/null
+    fi
+}
+
+# Generate tmux session name
+# Usage: psm_tmux_session_name <alias> <type> <id>
+psm_tmux_session_name() {
+    local alias="$1"
+    local type="$2"
+    local id="$3"
+
+    echo "psm:${alias}:${type}-${id}"
+}

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

@@ -0,0 +1,171 @@
+#!/bin/bash
+# PSM Worktree Management
+
+# Create a worktree for PR review
+# Usage: psm_create_pr_worktree <local_repo> <alias> <pr_number> <pr_branch>
+psm_create_pr_worktree() {
+    local local_repo="$1"
+    local alias="$2"
+    local pr_number="$3"
+    local pr_branch="$4"
+
+    local worktree_root=$(psm_get_worktree_root)
+    local worktree_path="${worktree_root}/${alias}/pr-${pr_number}"
+
+    # Check if worktree already exists
+    if [[ -d "$worktree_path" ]]; then
+        echo "exists|$worktree_path"
+        return 1
+    fi
+
+    # Ensure parent directory exists
+    mkdir -p "${worktree_root}/${alias}"
+
+    # Fetch the PR branch
+    cd "$local_repo" || return 1
+    git fetch origin "pull/${pr_number}/head:psm-pr-${pr_number}-review" 2>/dev/null || {
+        echo "error|Failed to fetch PR #${pr_number}"
+        return 1
+    }
+
+    # Create worktree
+    git worktree add "$worktree_path" "psm-pr-${pr_number}-review" 2>/dev/null || {
+        echo "error|Failed to create worktree"
+        return 1
+    }
+
+    echo "created|$worktree_path"
+    return 0
+}
+
+# Create a worktree for issue fix
+# Usage: psm_create_issue_worktree <local_repo> <alias> <issue_number> <slug> <base_branch>
+psm_create_issue_worktree() {
+    local local_repo="$1"
+    local alias="$2"
+    local issue_number="$3"
+    local slug="$4"
+    local base_branch="${5:-main}"
+
+    local worktree_root=$(psm_get_worktree_root)
+    local worktree_path="${worktree_root}/${alias}/issue-${issue_number}"
+    local branch_name="fix/${issue_number}-${slug}"
+
+    # Check if worktree already exists
+    if [[ -d "$worktree_path" ]]; then
+        echo "exists|$worktree_path|$branch_name"
+        return 1
+    fi
+
+    mkdir -p "${worktree_root}/${alias}"
+
+    cd "$local_repo" || return 1
+
+    # Fetch latest from origin
+    git fetch origin "$base_branch" 2>/dev/null || {
+        echo "error|Failed to fetch $base_branch"
+        return 1
+    }
+
+    # Create and checkout new branch
+    git branch "$branch_name" "origin/$base_branch" 2>/dev/null || {
+        # Branch might already exist
+        true
+    }
+
+    # Create worktree
+    git worktree add "$worktree_path" "$branch_name" 2>/dev/null || {
+        echo "error|Failed to create worktree"
+        return 1
+    }
+
+    echo "created|$worktree_path|$branch_name"
+    return 0
+}
+
+# Create a worktree for feature development
+# Usage: psm_create_feature_worktree <local_repo> <alias> <feature_name> <base_branch>
+psm_create_feature_worktree() {
+    local local_repo="$1"
+    local alias="$2"
+    local feature_name="$3"
+    local base_branch="${4:-main}"
+
+    local worktree_root=$(psm_get_worktree_root)
+    local safe_name=$(psm_sanitize "$feature_name")
+    local worktree_path="${worktree_root}/${alias}/feat-${safe_name}"
+    local branch_name="feature/${safe_name}"
+
+    # Check if worktree already exists
+    if [[ -d "$worktree_path" ]]; then
+        echo "exists|$worktree_path|$branch_name"
+        return 1
+    fi
+
+    mkdir -p "${worktree_root}/${alias}"
+
+    cd "$local_repo" || return 1
+
+    # Fetch latest
+    git fetch origin "$base_branch" 2>/dev/null || {
+        echo "error|Failed to fetch $base_branch"
+        return 1
+    }
+
+    # Create branch
+    git branch "$branch_name" "origin/$base_branch" 2>/dev/null || true
+
+    # Create worktree
+    git worktree add "$worktree_path" "$branch_name" 2>/dev/null || {
+        echo "error|Failed to create worktree"
+        return 1
+    }
+
+    echo "created|$worktree_path|$branch_name"
+    return 0
+}
+
+# Remove a worktree
+# Usage: psm_remove_worktree <local_repo> <worktree_path>
+psm_remove_worktree() {
+    local local_repo="$1"
+    local worktree_path="$2"
+
+    if [[ ! -d "$worktree_path" ]]; then
+        echo "not_found|$worktree_path"
+        return 1
+    fi
+
+    # Check for uncommitted changes
+    if [[ -d "$worktree_path/.git" ]] || [[ -f "$worktree_path/.git" ]]; then
+        cd "$worktree_path" || return 1
+        if [[ -n $(git status --porcelain 2>/dev/null) ]]; then
+            echo "dirty|$worktree_path"
+            return 1
+        fi
+    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"
+    }
+
+    echo "removed|$worktree_path"
+    return 0
+}
+
+# List all PSM worktrees
+psm_list_worktrees() {
+    local worktree_root=$(psm_get_worktree_root)
+
+    if [[ ! -d "$worktree_root" ]]; then
+        return 0
+    fi
+
+    find "$worktree_root" -mindepth 2 -maxdepth 2 -type d 2>/dev/null | while read -r dir; do
+        local alias=$(basename "$(dirname "$dir")")
+        local name=$(basename "$dir")
+        echo "${alias}:${name}|${dir}"
+    done
+}