oh-my-claude-sisyphus 3.8.15 → 3.9.0

package/skills/omc-setup/SKILL.md

@@ -146,23 +146,81 @@ mkdir -p .claude && echo ".claude directory ready"
 ### Download Fresh CLAUDE.md
 
 ```bash
+# Define target path
+TARGET_PATH=".claude/CLAUDE.md"
+
 # Extract old version before download
-OLD_VERSION=$(grep -m1 "^# oh-my-claudecode" .claude/CLAUDE.md 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "none")
+OLD_VERSION=$(grep -m1 "^# oh-my-claudecode" "$TARGET_PATH" 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "none")
 
-# Backup existing CLAUDE.md before overwriting (if it exists)
-if [ -f ".claude/CLAUDE.md" ]; then
-  BACKUP_DATE=$(date +%Y-%m-%d)
-  BACKUP_PATH=".claude/CLAUDE.md.backup.${BACKUP_DATE}"
-  cp .claude/CLAUDE.md "$BACKUP_PATH"
+# Backup existing
+if [ -f "$TARGET_PATH" ]; then
+  BACKUP_DATE=$(date +%Y-%m-%d_%H%M%S)
+  BACKUP_PATH="${TARGET_PATH}.backup.${BACKUP_DATE}"
+  cp "$TARGET_PATH" "$BACKUP_PATH"
   echo "Backed up existing CLAUDE.md to $BACKUP_PATH"
 fi
 
-# Download fresh CLAUDE.md from GitHub
-curl -fsSL "https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md" -o .claude/CLAUDE.md && \
-echo "Downloaded CLAUDE.md to .claude/CLAUDE.md"
+# Download fresh OMC content to temp file
+TEMP_OMC=$(mktemp /tmp/omc-claude-XXXXXX.md)
+trap 'rm -f "$TEMP_OMC"' EXIT
+curl -fsSL "https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md" -o "$TEMP_OMC"
+
+if [ ! -s "$TEMP_OMC" ]; then
+  echo "ERROR: Failed to download CLAUDE.md. Aborting."
+  rm -f "$TEMP_OMC"
+  return 1
+fi
+
+# Strip existing markers from downloaded content (idempotency)
+if grep -q '<!-- OMC:START -->' "$TEMP_OMC"; then
+  # Extract content between markers
+  sed -n '/<!-- OMC:START -->/,/<!-- OMC:END -->/{//!p}' "$TEMP_OMC" > "${TEMP_OMC}.clean"
+  mv "${TEMP_OMC}.clean" "$TEMP_OMC"
+fi
+
+if [ ! -f "$TARGET_PATH" ]; then
+  # Fresh install: wrap in markers
+  {
+    echo '<!-- OMC:START -->'
+    cat "$TEMP_OMC"
+    echo '<!-- OMC:END -->'
+  } > "$TARGET_PATH"
+  rm -f "$TEMP_OMC"
+  echo "Installed CLAUDE.md (fresh)"
+else
+  # Merge: preserve user content outside OMC markers
+  if grep -q '<!-- OMC:START -->' "$TARGET_PATH"; then
+    # Has markers: replace OMC section, keep user content
+    BEFORE_OMC=$(sed -n '1,/<!-- OMC:START -->/{ /<!-- OMC:START -->/!p }' "$TARGET_PATH")
+    AFTER_OMC=$(sed -n '/<!-- OMC:END -->/,${  /<!-- OMC:END -->/!p }' "$TARGET_PATH")
+    {
+      [ -n "$BEFORE_OMC" ] && printf '%s\n' "$BEFORE_OMC"
+      echo '<!-- OMC:START -->'
+      cat "$TEMP_OMC"
+      echo '<!-- OMC:END -->'
+      [ -n "$AFTER_OMC" ] && printf '%s\n' "$AFTER_OMC"
+    } > "${TARGET_PATH}.tmp"
+    mv "${TARGET_PATH}.tmp" "$TARGET_PATH"
+    echo "Updated OMC section (user customizations preserved)"
+  else
+    # No markers: wrap new content in markers, append old content as user section
+    OLD_CONTENT=$(cat "$TARGET_PATH")
+    {
+      echo '<!-- OMC:START -->'
+      cat "$TEMP_OMC"
+      echo '<!-- OMC:END -->'
+      echo ""
+      echo "<!-- User customizations (migrated from previous CLAUDE.md) -->"
+      printf '%s\n' "$OLD_CONTENT"
+    } > "${TARGET_PATH}.tmp"
+    mv "${TARGET_PATH}.tmp" "$TARGET_PATH"
+    echo "Migrated existing CLAUDE.md (added OMC markers, preserved old content)"
+  fi
+  rm -f "$TEMP_OMC"
+fi
 
 # Extract new version and report
-NEW_VERSION=$(grep -m1 "^# oh-my-claudecode" .claude/CLAUDE.md 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
+NEW_VERSION=$(grep -m1 "^# oh-my-claudecode" "$TARGET_PATH" 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
 if [ "$OLD_VERSION" = "none" ]; then
   echo "Installed CLAUDE.md: $NEW_VERSION"
 elif [ "$OLD_VERSION" = "$NEW_VERSION" ]; then
@@ -227,23 +285,81 @@ Do not continue to HUD setup or other steps.
 ### Download Fresh CLAUDE.md
 
 ```bash
+# Define target path
+TARGET_PATH="$HOME/.claude/CLAUDE.md"
+
 # Extract old version before download
-OLD_VERSION=$(grep -m1 "^# oh-my-claudecode" ~/.claude/CLAUDE.md 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "none")
+OLD_VERSION=$(grep -m1 "^# oh-my-claudecode" "$TARGET_PATH" 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "none")
 
-# Backup existing CLAUDE.md before overwriting (if it exists)
-if [ -f "$HOME/.claude/CLAUDE.md" ]; then
-  BACKUP_DATE=$(date +%Y-%m-%d)
-  BACKUP_PATH="$HOME/.claude/CLAUDE.md.backup.${BACKUP_DATE}"
-  cp "$HOME/.claude/CLAUDE.md" "$BACKUP_PATH"
+# Backup existing
+if [ -f "$TARGET_PATH" ]; then
+  BACKUP_DATE=$(date +%Y-%m-%d_%H%M%S)
+  BACKUP_PATH="${TARGET_PATH}.backup.${BACKUP_DATE}"
+  cp "$TARGET_PATH" "$BACKUP_PATH"
   echo "Backed up existing CLAUDE.md to $BACKUP_PATH"
 fi
 
-# Download fresh CLAUDE.md to global config
-curl -fsSL "https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md" -o ~/.claude/CLAUDE.md && \
-echo "Downloaded CLAUDE.md to ~/.claude/CLAUDE.md"
+# Download fresh OMC content to temp file
+TEMP_OMC=$(mktemp /tmp/omc-claude-XXXXXX.md)
+trap 'rm -f "$TEMP_OMC"' EXIT
+curl -fsSL "https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md" -o "$TEMP_OMC"
+
+if [ ! -s "$TEMP_OMC" ]; then
+  echo "ERROR: Failed to download CLAUDE.md. Aborting."
+  rm -f "$TEMP_OMC"
+  return 1
+fi
+
+# Strip existing markers from downloaded content (idempotency)
+if grep -q '<!-- OMC:START -->' "$TEMP_OMC"; then
+  # Extract content between markers
+  sed -n '/<!-- OMC:START -->/,/<!-- OMC:END -->/{//!p}' "$TEMP_OMC" > "${TEMP_OMC}.clean"
+  mv "${TEMP_OMC}.clean" "$TEMP_OMC"
+fi
+
+if [ ! -f "$TARGET_PATH" ]; then
+  # Fresh install: wrap in markers
+  {
+    echo '<!-- OMC:START -->'
+    cat "$TEMP_OMC"
+    echo '<!-- OMC:END -->'
+  } > "$TARGET_PATH"
+  rm -f "$TEMP_OMC"
+  echo "Installed CLAUDE.md (fresh)"
+else
+  # Merge: preserve user content outside OMC markers
+  if grep -q '<!-- OMC:START -->' "$TARGET_PATH"; then
+    # Has markers: replace OMC section, keep user content
+    BEFORE_OMC=$(sed -n '1,/<!-- OMC:START -->/{ /<!-- OMC:START -->/!p }' "$TARGET_PATH")
+    AFTER_OMC=$(sed -n '/<!-- OMC:END -->/,${  /<!-- OMC:END -->/!p }' "$TARGET_PATH")
+    {
+      [ -n "$BEFORE_OMC" ] && printf '%s\n' "$BEFORE_OMC"
+      echo '<!-- OMC:START -->'
+      cat "$TEMP_OMC"
+      echo '<!-- OMC:END -->'
+      [ -n "$AFTER_OMC" ] && printf '%s\n' "$AFTER_OMC"
+    } > "${TARGET_PATH}.tmp"
+    mv "${TARGET_PATH}.tmp" "$TARGET_PATH"
+    echo "Updated OMC section (user customizations preserved)"
+  else
+    # No markers: wrap new content in markers, append old content as user section
+    OLD_CONTENT=$(cat "$TARGET_PATH")
+    {
+      echo '<!-- OMC:START -->'
+      cat "$TEMP_OMC"
+      echo '<!-- OMC:END -->'
+      echo ""
+      echo "<!-- User customizations (migrated from previous CLAUDE.md) -->"
+      printf '%s\n' "$OLD_CONTENT"
+    } > "${TARGET_PATH}.tmp"
+    mv "${TARGET_PATH}.tmp" "$TARGET_PATH"
+    echo "Migrated existing CLAUDE.md (added OMC markers, preserved old content)"
+  fi
+  rm -f "$TEMP_OMC"
+fi
 
 # Extract new version and report
-NEW_VERSION=$(grep -m1 "^# oh-my-claudecode" ~/.claude/CLAUDE.md 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
+NEW_VERSION=$(grep -m1 "^# oh-my-claudecode" "$TARGET_PATH" 2>/dev/null | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
 if [ "$OLD_VERSION" = "none" ]; then
   echo "Installed CLAUDE.md: $NEW_VERSION"
 elif [ "$OLD_VERSION" = "$NEW_VERSION" ]; then
@@ -456,6 +572,67 @@ All functionality is available through the plugin system:
 
 Skip this step - the plugin provides all features.
 
+## Step 3.8.5: Select Task Management Tool
+
+First, detect available task tools:
+
+```bash
+# Detect beads (bd)
+BD_VERSION=""
+if command -v bd &>/dev/null; then
+  BD_VERSION=$(bd --version 2>/dev/null | head -1 || echo "installed")
+fi
+
+# Detect beads-rust (br)
+BR_VERSION=""
+if command -v br &>/dev/null; then
+  BR_VERSION=$(br --version 2>/dev/null | head -1 || echo "installed")
+fi
+
+# Report findings
+if [ -n "$BD_VERSION" ]; then
+  echo "Found beads (bd): $BD_VERSION"
+fi
+if [ -n "$BR_VERSION" ]; then
+  echo "Found beads-rust (br): $BR_VERSION"
+fi
+if [ -z "$BD_VERSION" ] && [ -z "$BR_VERSION" ]; then
+  echo "No external task tools found. Using built-in Tasks."
+fi
+```
+
+If **neither** beads nor beads-rust is detected, skip this step (default to built-in).
+
+If beads or beads-rust is detected, use AskUserQuestion:
+
+**Question:** "Which task management tool should I use for tracking work?"
+
+**Options:**
+1. **Built-in Tasks (default)** - Use Claude Code's native TaskCreate/TodoWrite. Tasks are session-only.
+2. **Beads (bd)** - Git-backed persistent tasks. Survives across sessions. [Only if detected]
+3. **Beads-Rust (br)** - Lightweight Rust port of beads. [Only if detected]
+
+(Only show options 2/3 if the corresponding tool is detected)
+
+Store the preference:
+
+```bash
+CONFIG_FILE="$HOME/.claude/.omc-config.json"
+mkdir -p "$(dirname "$CONFIG_FILE")"
+
+if [ -f "$CONFIG_FILE" ]; then
+  EXISTING=$(cat "$CONFIG_FILE")
+else
+  EXISTING='{}'
+fi
+
+# USER_CHOICE is "builtin", "beads", or "beads-rust" based on user selection
+echo "$EXISTING" | jq --arg tool "USER_CHOICE" '. + {taskTool: $tool, taskToolConfig: {injectInstructions: true, useMcp: false}}' > "$CONFIG_FILE"
+echo "Task tool set to: USER_CHOICE"
+```
+
+**Note:** The beads context instructions will be injected automatically on the next session start. No restart is needed for config to take effect.
+
 ## Step 4: Verify Plugin Installation
 
 ```bash

package/skills/plan/SKILL.md

@@ -17,6 +17,20 @@ You guide users through planning by:
 
 ## Planning Modes
 
+| Mode | Trigger | Behavior |
+|------|---------|----------|
+| interview | Default | Interactive requirements gathering with adaptive exploration |
+| direct | --direct, detailed request | Skip interview, generate plan directly |
+| consensus | --consensus, "ralplan" | Planner → Architect → Critic loop until consensus |
+| review | --review | Critic review of existing plan |
+
+### Review Mode
+
+When `--review` is specified or user says "review this plan":
+1. Read the plan file from `.omc/plans/`
+2. Spawn Critic agent to review
+3. Return verdict (OKAY or REJECT with improvements)
+
 ### Auto-Detection: Interview vs Direct Planning
 
 **Interview Mode** (when request is BROAD):
@@ -53,6 +67,54 @@ Ask clarifying questions about: Goals, Constraints, Context, Risks, Preferences
 
 **When plain text is OK:** Questions needing specific values (port numbers, names) or follow-up clarifications.
 
+## Adaptive Context Gathering (CRITICAL)
+
+Before asking ANY question, classify it:
+
+### Question Classification
+
+| Type | Examples | Action |
+|------|----------|--------|
+| **Codebase Fact** | "What patterns exist?", "Where is X implemented?" | Explore first, DON'T ask user |
+| **User Preference** | "Priority?", "Timeline?", "Risk tolerance?" | Ask user via AskUserQuestion |
+| **Scope Decision** | "Include feature Y?" | Ask user |
+| **Requirement** | "Performance constraints?" | Ask user |
+
+### Adaptive Flow
+
+1. Generate interview question
+2. Classify: Is this a codebase fact or user preference?
+3. If **CODEBASE FACT**:
+   a. Spawn `explore` agent (haiku, 30s timeout)
+   b. Query: focused on the specific fact needed
+   c. Use findings to inform next question or skip question entirely
+4. If **USER PREFERENCE**:
+   a. Use AskUserQuestion tool with options
+   b. Wait for response
+5. Repeat for next question
+
+### Exploration Integration
+
+When context is gathered via explore agent:
+- **DO NOT** ask "What patterns does the codebase use?"
+- **DO** say "I see the codebase uses [pattern X]. Would you like to follow this pattern or try something different?"
+
+### Example Adaptive Interview
+
+**Without Adaptive (BAD):**
+```
+Planner: "Where is authentication implemented in your codebase?"
+User: "Uh, somewhere in src/auth I think?"
+```
+
+**With Adaptive (GOOD):**
+```
+Planner: [spawns explore agent: "find authentication implementation"]
+Planner: [receives: "Auth is in src/auth/ using JWT with passport.js"]
+Planner: "I see you're using JWT authentication with passport.js in src/auth/.
+         For this new feature, should we extend the existing auth or add a separate auth flow?"
+```
+
 **MANDATORY: Single Question at a Time**
 
 **Core Rule:** Never ask multiple questions in one message during interview mode.

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
+}