claudecode-omc 5.4.0 → 5.5.1

package/bundled/upstream/oh-my-claudecode/skills/omc-setup/phases/03-integrations.md

@@ -5,7 +5,7 @@
 ## Step 3.1: Verify Plugin Installation
 
 ```bash
-grep -q "oh-my-claudecode" ~/.claude/settings.json && echo "Plugin verified" || echo "Plugin NOT found - run: claude /install-plugin oh-my-claudecode"
+grep -q "oh-my-claudecode" "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json" && echo "Plugin verified" || echo "Plugin NOT found - run: claude /install-plugin oh-my-claudecode"
 ```
 
 ## Step 3.2: Offer MCP Server Configuration
@@ -44,7 +44,7 @@ Use AskUserQuestion:
 First, read the current settings.json:
 
 ```bash
-SETTINGS_FILE="$HOME/.claude/settings.json"
+SETTINGS_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json"
 
 if [ -f "$SETTINGS_FILE" ]; then
   echo "Current settings.json found"
@@ -54,12 +54,12 @@ else
 fi
 ```
 
-Then use the Read tool to read `~/.claude/settings.json` (if it exists). Use the Edit tool to merge the teams configuration while preserving ALL existing settings.
+Then use the Read tool to read `${CLAUDE_CONFIG_DIR:-~/.claude}/settings.json` (if it exists). Use the Edit tool to merge the teams configuration while preserving ALL existing settings.
 
 Use jq to safely merge without overwriting existing settings:
 
 ```bash
-SETTINGS_FILE="$HOME/.claude/settings.json"
+SETTINGS_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json"
 
 if [ -f "$SETTINGS_FILE" ]; then
   TEMP_FILE=$(mktemp)
@@ -94,7 +94,7 @@ Use AskUserQuestion:
 If user chooses anything other than "Auto", add `teammateMode` to settings.json:
 
 ```bash
-SETTINGS_FILE="$HOME/.claude/settings.json"
+SETTINGS_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json"
 
 # TEAMMATE_MODE is "in-process" or "tmux" based on user choice
 # Skip this if user chose "Auto" (that's the default)
@@ -113,17 +113,17 @@ Use AskUserQuestion with multiple questions:
 2. **5 agents (maximum)** - Maximum parallelism for large tasks
 3. **2 agents** - Conservative, for smaller projects
 
-**Question 2:** "Which agent type should teammates use by default?"
+**Question 2:** "Which CLI provider should teammates use by default?"
 
 **Options:**
-1. **executor (Recommended)** - General-purpose code implementation agent
-2. **debugger** - Specialized for build/type error fixing and debugging
-3. **designer** - Specialized for UI/frontend work
+1. **claude (Recommended)** - Default provider with the widest compatibility
+2. **codex** - Use Codex CLI workers by default when installed
+3. **gemini** - Use Gemini CLI workers by default when installed
 
 Store the team configuration in `~/.claude/.omc-config.json`:
 
 ```bash
-CONFIG_FILE="$HOME/.claude/.omc-config.json"
+CONFIG_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/.omc-config.json"
 mkdir -p "$(dirname "$CONFIG_FILE")"
 
 if [ -f "$CONFIG_FILE" ]; then
@@ -136,11 +136,11 @@ fi
 echo "$EXISTING" | jq \
   --argjson maxAgents MAX_AGENTS \
   --arg agentType "AGENT_TYPE" \
-  '. + {team: {maxAgents: $maxAgents, defaultAgentType: $agentType, monitorIntervalMs: 30000, shutdownTimeoutMs: 15000}}' > "$CONFIG_FILE"
+  '. + {team: {ops: {maxAgents: $maxAgents, defaultAgentType: $agentType, monitorIntervalMs: 30000, shutdownTimeoutMs: 15000}}}' > "$CONFIG_FILE"
 
 echo "Team configuration saved:"
 echo "  Max agents: MAX_AGENTS"
-echo "  Default agent: AGENT_TYPE"
+echo "  Default provider: AGENT_TYPE"
 echo "  Model: teammates inherit your session model"
 ```
 
@@ -151,7 +151,7 @@ echo "  Model: teammates inherit your session model"
 After all modifications, verify settings.json is valid JSON and contains the expected keys:
 
 ```bash
-SETTINGS_FILE="$HOME/.claude/settings.json"
+SETTINGS_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json"
 
 if jq empty "$SETTINGS_FILE" 2>/dev/null; then
   echo "settings.json: valid JSON"

package/bundled/upstream/oh-my-claudecode/skills/omc-setup/phases/04-welcome.md

@@ -5,7 +5,7 @@
 Check if user has existing 2.x configuration:
 
 ```bash
-ls ~/.claude/commands/ralph-loop.md 2>/dev/null || ls ~/.claude/commands/ultrawork.md 2>/dev/null
+ls "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands/ralph-loop.md 2>/dev/null || ls "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands/ultrawork.md 2>/dev/null
 ```
 
 If found, this is an upgrade from 2.x. Set `IS_UPGRADE=true`.
@@ -178,8 +178,8 @@ Get the current OMC version and mark setup complete:
 OMC_VERSION=""
 if [ -f ".claude/CLAUDE.md" ]; then
   OMC_VERSION=$(grep -m1 'OMC:VERSION:' .claude/CLAUDE.md 2>/dev/null | sed -E 's/.*OMC:VERSION:([^ ]+).*/\1/' || true)
-elif [ -f "$HOME/.claude/CLAUDE.md" ]; then
-  OMC_VERSION=$(grep -m1 'OMC:VERSION:' "$HOME/.claude/CLAUDE.md" 2>/dev/null | sed -E 's/.*OMC:VERSION:([^ ]+).*/\1/' || true)
+elif [ -f "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/CLAUDE.md" ]; then
+  OMC_VERSION=$(grep -m1 'OMC:VERSION:' "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/CLAUDE.md" 2>/dev/null | sed -E 's/.*OMC:VERSION:([^ ]+).*/\1/' || true)
 fi
 if [ -z "$OMC_VERSION" ]; then
   OMC_VERSION=$(omc --version 2>/dev/null | head -1 || true)

package/bundled/upstream/oh-my-claudecode/skills/omc-teams/SKILL.md

@@ -79,6 +79,27 @@ Validate before decomposing or running anything:
 
 Break work into N independent subtasks (file- or concern-scoped) to avoid write conflicts.
 
+### Phase 2.5: Resolve workspace root for multi-repo plans
+
+`omc team` launches all workers with one shared working directory. For single-repo
+tasks, the current repo is usually correct. For multi-repo tasks, especially when a
+plan lives in one repo but the implementation touches sibling repos, resolve the
+working directory before launch:
+
+- If the task references a plan artifact under one repo (for example
+  `tool/.omc/plans/task-1200-gwd-gifs.md`) and target paths in sibling repos
+  (for example `api/` and `admin/`), choose the shared workspace root that contains
+  all participating repos (for example the parent `inter/` directory).
+- Use an **absolute plan path** in the task text so the workers can still find the
+  plan after `--cwd` changes the launch directory.
+- Include the explicit repo paths or repo names in the task text and subtasks.
+- Do not anchor the launch cwd to only the repo containing `.omc/plans/...` when
+  target repos are siblings; that strands `codex`, `claude`, and `gemini` workers in
+  the plan repo instead of the implementation workspace.
+- If no safe shared workspace root can be identified, do not launch `/omc-teams`.
+  Report the single-cwd constraint and ask for, or derive from evidence, the intended
+  workspace root.
+
 ### Phase 3: Start CLI team runtime
 
 Activate mode state (recommended):
@@ -93,6 +114,13 @@ Start workers via CLI:
 omc team <N>:<claude|codex|gemini> "<task>"
 ```
 
+For the multi-repo case resolved in Phase 2.5, launch from the shared workspace root
+with the existing `--cwd` contract and keep the plan reference absolute:
+
+```bash
+omc team <N>:<claude|codex|gemini> "<task with absolute plan path and explicit repo paths>" --cwd <workspace-root>
+```
+
 Team name defaults to a slug from the task text (example: `review-auth-flow`).
 
 After launch, verify the command actually executed instead of assuming Enter fired. Check pane output and confirm the command or worker bootstrap text appears in pane history:

package/bundled/upstream/oh-my-claudecode/skills/plan/SKILL.md

@@ -1,6 +1,7 @@
 ---
 name: omc-plan
 description: Strategic planning with optional interview workflow
+argument-hint: "[--direct|--consensus|--review] [--interactive] [--deliberate] <task description>"
 pipeline: [deep-interview, omc-plan, autopilot]
 next-skill: autopilot
 handoff: .omc/plans/ralplan-*.md

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/SKILL.md

@@ -50,7 +50,7 @@ Supported formats:
 {
   "aliases": {
     "omc": {
-      "repo": "owner/oh-my-claudecode",
+      "repo": "Yeachan-Heo/oh-my-claudecode",
       "local": "~/Workspace/oh-my-claudecode",
       "default_base": "main"
     }
@@ -250,7 +250,15 @@ Parse `{{ARGUMENTS}}` to determine:
 
 8. **Launch Claude Code** (unless --no-claude):
    ```bash
-   tmux send-keys -t "psm:$project_alias:pr-$pr_number" "claude" Enter
+   # --dangerously-skip-permissions prevents the "Do you trust this directory?" prompt
+   # and repeated tool-approval prompts from stalling the session (issue #2508).
+   tmux send-keys -t "psm:$project_alias:pr-$pr_number" "claude --dangerously-skip-permissions" Enter
+
+   # After claude boots (PSM_CLAUDE_STARTUP_DELAY, default 5s), deliver the task.
+   # Use -l (literal) so special characters are not misinterpreted by tmux.
+   sleep "${PSM_CLAUDE_STARTUP_DELAY:-5}"
+   tmux send-keys -t "psm:$project_alias:pr-$pr_number" -l \
+     "Review PR #$pr_number: \"$pr_title\" by @$pr_author ($head_branch → $base_branch). URL: $pr_url." Enter
    ```
 
 9. **Output session info**:
@@ -293,7 +301,14 @@ Parse `{{ARGUMENTS}}` to determine:
 
 5. **Create session metadata** (similar to review, type="fix")
 
-6. **Update registry, create tmux, launch claude** (same as review)
+6. **Update registry, create tmux, launch claude**:
+   Same as review, but pass issue context as the initial task prompt:
+   ```bash
+   tmux send-keys -t "psm:$project_alias:issue-$issue_number" "claude --dangerously-skip-permissions" Enter
+   # After claude boots, deliver the task (see PSM_CLAUDE_STARTUP_DELAY):
+   tmux send-keys -t "psm:$project_alias:issue-$issue_number" -l \
+     "Fix issue #$issue_number: \"$issue_title\". URL: $issue_url. Branch: $branch_name." Enter
+   ```
 
 ### Subcommand: `feature <project> <name>`
 
@@ -317,7 +332,12 @@ Parse `{{ARGUMENTS}}` to determine:
    git worktree add "$worktree_path" "$branch_name"
    ```
 
-4. **Create session, tmux, launch claude** (same pattern)
+4. **Create session, tmux, launch claude** with feature context as initial prompt:
+   ```bash
+   tmux send-keys -t "psm:$project_alias:feat-$feature_name" "claude --dangerously-skip-permissions" Enter
+   tmux send-keys -t "psm:$project_alias:feat-$feature_name" -l \
+     "Implement feature \"$feature_name\" for project $project. Branch: $branch_name." Enter
+   ```
 
 ### Subcommand: `list [project]`
 
@@ -544,7 +564,7 @@ if [[ ! -f ~/.psm/projects.json ]]; then
 {
   "aliases": {
     "omc": {
-      "repo": "owner/oh-my-claudecode",
+      "repo": "Yeachan-Heo/oh-my-claudecode",
       "local": "~/Workspace/oh-my-claudecode",
       "default_base": "main"
     }

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/lib/config.sh

@@ -13,24 +13,11 @@ psm_init() {
 
     # Create default projects.json if not exists
     if [[ ! -f "$PSM_PROJECTS" ]]; then
-        local default_repo="${OMC_REPO:-}"
-        local cfg_file="$HOME/.claude/.omc-config.json"
-
-        if [[ -z "$default_repo" && -f "$cfg_file" ]]; then
-            default_repo=$(jq -r '.updateRepository // empty' "$cfg_file" 2>/dev/null)
-        fi
-        if [[ -z "$default_repo" && -n "${CLAUDE_PLUGIN_ROOT:-}" && -d "$CLAUDE_PLUGIN_ROOT/.git" ]]; then
-            default_repo=$(git -C "$CLAUDE_PLUGIN_ROOT" remote get-url origin 2>/dev/null | sed -E 's#^git@github.com:##; s#^https://github.com/##; s#\\.git$##')
-        fi
-        if [[ -z "$default_repo" ]]; then
-            default_repo="Yeachan-Heo/oh-my-claudecode"
-        fi
-
-        cat > "$PSM_PROJECTS" << EOF
+        cat > "$PSM_PROJECTS" << 'EOF'
 {
   "aliases": {
     "omc": {
-      "repo": "$default_repo",
+      "repo": "Yeachan-Heo/oh-my-claudecode",
       "local": "~/Workspace/oh-my-claudecode",
       "default_base": "main"
     }

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/lib/providers/github.sh

@@ -14,7 +14,7 @@ provider_github_detect_ref() {
 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
+    gh pr view "$pr_number" --repo "$repo" --json number,title,author,headRefName,baseRefName,body,files,url 2>/dev/null
 }
 
 provider_github_fetch_issue() {

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/lib/session.sh

@@ -161,9 +161,9 @@ psm_read_session_metadata() {
 
 # 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"
+    jq -r '.sessions | to_entries[] | select(.value.type == "review" and (.value.state // "active") == "active") | "\(.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"
+    jq -r '.sessions | to_entries[] | select(.value.type == "fix" and (.value.state // "active") == "active") | "\(.value.id)|\(.value.metadata.issue_number // empty)|\(.value.project)"' "$PSM_SESSIONS"
 }

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/lib/tmux.sh

@@ -33,23 +33,128 @@ psm_create_tmux_session() {
     return 0
 }
 
-# Launch Claude Code in tmux session
-# Usage: psm_launch_claude <session_name>
+# Launch Claude Code in tmux session, optionally injecting either a context-file
+# trigger prompt or a literal initial prompt.
+# Usage: psm_launch_claude <session_name> [initial_context]
+# initial_context may be either:
+#   - a path relative to the worktree root (e.g. .psm/review.md), or
+#   - a literal prompt string to send after Claude boots.
+#
+# Passes --dangerously-skip-permissions so the session does not stall on
+# directory-trust or repeated tool-approval prompts (issue #2508).
+# Set PSM_CLAUDE_STARTUP_DELAY (default: 5s) to tune literal-prompt delivery.
 psm_launch_claude() {
     local session_name="$1"
+    local initial_context="${2:-}"
 
     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
+    # --dangerously-skip-permissions bypasses both the directory-trust prompt and
+    # every per-tool approval prompt. Without this flag, unattended PSM sessions
+    # can block indefinitely on the first tool call (issue #2508).
+    tmux send-keys -t "$session_name" "claude --dangerously-skip-permissions" Enter
+
+    if [[ -n "$initial_context" ]]; then
+        local session_path=""
+        session_path=$(tmux display-message -p -t "$session_name" '#{pane_current_path}' 2>/dev/null || true)
+
+        # If the second arg resolves to a file in the worktree, preserve the
+        # existing context-file flow. Otherwise treat it as a literal prompt.
+        if [[ -n "$session_path" && -f "$session_path/$initial_context" ]]; then
+            psm_inject_prompt "$session_name" "$initial_context"
+        else
+            local startup_delay="${PSM_CLAUDE_STARTUP_DELAY:-5}"
+            (
+                sleep "$startup_delay"
+                tmux send-keys -t "$session_name" -l -- "$initial_context" 2>/dev/null || true
+                tmux send-keys -t "$session_name" Enter 2>/dev/null || true
+            ) &
+        fi
+    fi
 
     echo "launched|$session_name"
     return 0
 }
 
+# Render a PSM template file by substituting {{KEY}} placeholders.
+# Usage: psm_render_template <template_file> [KEY=VALUE ...]
+# Outputs rendered content to stdout; returns 1 if template not found.
+psm_render_template() {
+    local template_file="$1"
+    shift
+
+    if [[ ! -f "$template_file" ]]; then
+        echo "error|Template not found: $template_file" >&2
+        return 1
+    fi
+
+    local content
+    content=$(cat "$template_file")
+
+    for assignment in "$@"; do
+        local key="${assignment%%=*}"
+        local value="${assignment#*=}"
+        # Bash parameter expansion handles multiline values safely
+        content="${content//\{\{${key}\}\}/$value}"
+    done
+
+    printf '%s\n' "$content"
+}
+
+# Returns 0 if the captured pane text shows Claude's interactive input prompt.
+# Matches '>' (standard prompt) or '?' (trust prompt) as the sole content of a line.
+# Usage: _psm_pane_has_claude_prompt <pane_text>
+_psm_pane_has_claude_prompt() {
+    local pane_text="$1"
+    printf '%s' "$pane_text" | grep -qE '^[[:space:]]*(>|\?)[[:space:]]*$'
+}
+
+# Poll the tmux pane until Claude's REPL prompt appears.
+# Usage: psm_wait_for_claude_prompt <session_name> [max_seconds]
+# Returns 0 when prompt detected; 1 on timeout.
+psm_wait_for_claude_prompt() {
+    local session_name="$1"
+    local max_wait="${2:-30}"
+    local waited=0
+
+    while [[ $waited -lt $max_wait ]]; do
+        local pane_content
+        pane_content=$(tmux capture-pane -t "$session_name" -p 2>/dev/null) || return 1
+        if _psm_pane_has_claude_prompt "$pane_content"; then
+            return 0
+        fi
+        sleep 1
+        (( waited++ )) || true
+    done
+
+    return 1
+}
+
+# Wait for Claude's REPL to be ready then inject a context-file trigger prompt.
+# Non-fatal: warns on timeout but does not fail the session creation.
+# Usage: psm_inject_prompt <session_name> <context_file_relative_path>
+psm_inject_prompt() {
+    local session_name="$1"
+    local context_file="$2"
+
+    if ! psm_wait_for_claude_prompt "$session_name"; then
+        echo "warn|Timed out waiting for Claude prompt; task context not injected" >&2
+        return 0
+    fi
+
+    local trigger="Read ${context_file} for full task context, then begin."
+
+    # Use literal mode (-l) to prevent tmux from interpreting key names in the text
+    tmux send-keys -t "$session_name" -l -- "$trigger"
+    sleep 0.15
+    tmux send-keys -t "$session_name" Enter
+
+    return 0
+}
+
 # Kill a tmux session
 # Usage: psm_kill_tmux_session <session_name>
 psm_kill_tmux_session() {

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/lib/worktree.sh

@@ -27,6 +27,30 @@ validate_worktree_path() {
     return 0
 }
 
+# Best-effort dependency bootstrap for clean PR review worktrees.
+# Reuses the source repo node_modules only when package.json matches exactly.
+# This keeps focused test commands like `npm run test:run -- ...` usable
+# without forcing a full install in every review worktree.
+psm_bootstrap_review_dependencies() {
+    local local_repo="$1"
+    local worktree_path="$2"
+
+    local source_package_json="${local_repo}/package.json"
+    local target_package_json="${worktree_path}/package.json"
+    local source_node_modules="${local_repo}/node_modules"
+    local target_node_modules="${worktree_path}/node_modules"
+
+    [[ -f "$source_package_json" ]] || return 0
+    [[ -f "$target_package_json" ]] || return 0
+    [[ -d "$source_node_modules" ]] || return 0
+    [[ ! -e "$target_node_modules" ]] || return 0
+
+    cmp -s "$source_package_json" "$target_package_json" || return 0
+
+    ln -s "$source_node_modules" "$target_node_modules" 2>/dev/null || true
+    return 0
+}
+
 # Create a worktree for PR review
 # Usage: psm_create_pr_worktree <local_repo> <alias> <pr_number> <pr_branch>
 psm_create_pr_worktree() {
@@ -60,6 +84,8 @@ psm_create_pr_worktree() {
         return 1
     }
 
+    psm_bootstrap_review_dependencies "$local_repo" "$worktree_path"
+
     echo "created|$worktree_path"
     return 0
 }

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/psm.sh

@@ -85,7 +85,7 @@ Reference formats:
 
 Examples:
   psm review omc#123
-  psm fix owner/oh-my-claudecode#42
+  psm fix Yeachan-Heo/oh-my-claudecode#42
   psm feature omc add-webhooks
   psm list
   psm attach omc:pr-123
@@ -145,6 +145,8 @@ cmd_review() {
     local head_branch=$(echo "$pr_info" | jq -r '.headRefName')
     local base_branch=$(echo "$pr_info" | jq -r '.baseRefName')
     local pr_url=$(echo "$pr_info" | jq -r '.url')
+    local pr_body=$(echo "$pr_info" | jq -r '.body // ""')
+    local changed_files=$(echo "$pr_info" | jq -r '.files[]?.path // empty' 2>/dev/null | head -50 || true)
 
     log_info "PR: #${pr_number} - ${pr_title}"
     log_info "Author: @${pr_author}"
@@ -190,6 +192,24 @@ cmd_review() {
 
     log_success "Worktree created at $worktree_path"
 
+    # Render PR review context file into the worktree so Claude starts with full task context
+    local context_rel=".psm/review.md"
+    local context_file="${worktree_path}/${context_rel}"
+    mkdir -p "$(dirname "$context_file")"
+    if ! psm_render_template "$SCRIPT_DIR/templates/pr-review.md" \
+            "PR_NUMBER=${pr_number}" \
+            "PR_TITLE=${pr_title}" \
+            "PR_AUTHOR=${pr_author}" \
+            "PR_URL=${pr_url}" \
+            "HEAD_BRANCH=${head_branch}" \
+            "BASE_BRANCH=${base_branch}" \
+            "PR_BODY=${pr_body}" \
+            "CHANGED_FILES=${changed_files}" \
+            > "$context_file"; then
+        log_warn "Failed to render review template; Claude will start without task context"
+        context_rel=""
+    fi
+
     # Create tmux session
     local session_name="psm:${alias}:pr-${pr_number}"
     local session_id="${alias}:pr-${pr_number}"
@@ -209,10 +229,10 @@ cmd_review() {
         else
             log_success "Tmux session created: $session_name"
 
-            # Launch Claude Code
+            # Launch Claude Code with review context so it starts on the PR task
             if [[ "$no_claude" != "true" ]]; then
                 log_info "Launching Claude Code..."
-                psm_launch_claude "$session_name"
+                psm_launch_claude "$session_name" "$context_rel"
             fi
         fi
     fi
@@ -284,6 +304,7 @@ cmd_fix() {
 
     # Fetch issue info
     local issue_info
+    local issue_body="" issue_labels=""
     if [[ "$provider" == "jira" ]]; then
         issue_info=$(provider_call "jira" fetch_issue "$provider_ref") || {
             log_error "Failed to fetch Jira issue ${provider_ref}"
@@ -291,6 +312,7 @@ cmd_fix() {
         }
         local issue_title=$(echo "$issue_info" | jq -r '.fields.summary')
         local issue_url=$(echo "$issue_info" | jq -r '.self // empty')
+        issue_body=$(echo "$issue_info" | jq -r '.fields.description // ""')
     else
         issue_info=$(provider_call "github" fetch_issue "$issue_number" "$repo") || {
             log_error "Failed to fetch issue #${issue_number}"
@@ -298,6 +320,8 @@ cmd_fix() {
         }
         local issue_title=$(echo "$issue_info" | jq -r '.title')
         local issue_url=$(echo "$issue_info" | jq -r '.url')
+        issue_body=$(echo "$issue_info" | jq -r '.body // ""')
+        issue_labels=$(echo "$issue_info" | jq -r '[.labels[].name] | join(", ")' 2>/dev/null || true)
     fi
     local slug=$(psm_slugify "$issue_title" 20)
 
@@ -345,6 +369,22 @@ cmd_fix() {
     log_success "Worktree created at $worktree_path"
     log_info "Branch: $branch_name"
 
+    # Render issue fix context file into the worktree so Claude starts with full task context
+    local fix_context_rel=".psm/fix.md"
+    local fix_context_file="${worktree_path}/${fix_context_rel}"
+    mkdir -p "$(dirname "$fix_context_file")"
+    if ! psm_render_template "$SCRIPT_DIR/templates/issue-fix.md" \
+            "ISSUE_NUMBER=${issue_number}" \
+            "ISSUE_TITLE=${issue_title}" \
+            "ISSUE_URL=${issue_url}" \
+            "ISSUE_LABELS=${issue_labels}" \
+            "ISSUE_BODY=${issue_body}" \
+            "BRANCH_NAME=${branch_name}" \
+            > "$fix_context_file"; then
+        log_warn "Failed to render issue fix template; Claude will start without task context"
+        fix_context_rel=""
+    fi
+
     # Create tmux session
     local session_name="psm:${alias}:issue-${issue_number}"
     local session_id="${alias}:issue-${issue_number}"
@@ -353,7 +393,7 @@ cmd_fix() {
     psm_create_tmux_session "$session_name" "$worktree_path"
 
     if [[ "$no_claude" != "true" ]]; then
-        psm_launch_claude "$session_name"
+        psm_launch_claude "$session_name" "$fix_context_rel"
     fi
 
     # Create metadata
@@ -423,7 +463,8 @@ cmd_feature() {
     local session_id="${project}:feat-${safe_name}"
 
     psm_create_tmux_session "$session_name" "$worktree_path"
-    psm_launch_claude "$session_name"
+    local feature_prompt="Implement feature \"${feature_name}\" for project ${project}. Working branch: ${branch_name}. Build the feature, add tests, and open a PR when ready: gh pr create --title \"feat: ${feature_name}\""
+    psm_launch_claude "$session_name" "$feature_prompt"
 
     psm_add_session "$session_id" "feature" "$project" "feat-${safe_name}" "$branch_name" "$base" "$session_name" "$worktree_path" "$local_path" "{}"
 

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/templates/pr-review.md

@@ -49,8 +49,11 @@ You are reviewing PR #{{PR_NUMBER}}: **{{PR_TITLE}}**
 # View diff
 git diff {{BASE_BRANCH}}...HEAD
 
-# Run tests
-npm test  # or appropriate test command
+# Run the narrowest relevant tests first
+# If this clean review worktree has a symlinked node_modules from the source repo,
+# focused vitest commands should work without a fresh install.
+npm run test:run -- <changed-test-paths>  # preferred focused verification
+npm test  # or appropriate full test command if focused coverage is insufficient
 
 # Check build
 npm run build  # or appropriate build command

package/bundled/upstream/oh-my-claudecode/skills/project-session-manager/templates/projects.json

@@ -1,7 +1,7 @@
 {
   "aliases": {
     "omc": {
-      "repo": "owner/oh-my-claudecode",
+      "repo": "Yeachan-Heo/oh-my-claudecode",
       "local": "~/Workspace/oh-my-claudecode",
       "default_base": "main"
     },