oh-my-copilot 4.13.2 → 4.13.21

package/skills/mcp-setup/SKILL.md

@@ -1,26 +1,27 @@
 ---
 name: mcp-setup
 description: Configure popular MCP servers for enhanced agent capabilities
+level: 2
 ---
 
 # MCP Setup
 
-Configure Model Context Protocol (MCP) servers to extend Copilot CLI's capabilities with external tools like web search, token optimization, and DevOps integration.
+Configure Model Context Protocol (MCP) servers to extend Claude Code's capabilities with external tools like web search, file system access, and GitHub integration.
 
 ## Overview
 
-MCP servers provide additional tools that Copilot CLI agents can use. This skill helps you configure popular MCP servers using the `copilot mcp add` command-line interface.
+MCP servers provide additional tools that Claude Code agents can use. This skill helps you configure popular MCP servers using the `claude mcp add` command-line interface.
 
 ## Step 1: Choose a Setup Path
 
-Use **AskUserQuestion** with **one question at a time** and **no more than 3 options per question**. Recent Copilot CLI builds reject larger option payloads as invalid tool parameters, so keep the MCP selection flow staged.
+Use **AskUserQuestion** with **one question at a time** and **no more than 3 options per question**. Recent Claude Code builds reject larger option payloads as invalid tool parameters, so keep the MCP selection flow staged.
 
 ### Step 1.1: First menu
 
 **Question:** "What kind of MCP setup would you like?"
 
 **Options:**
-1. **Recommended starter setup** - Fast path for the most common OMCP MCP additions
+1. **Recommended starter setup** - Fast path for the most common OMC MCP additions
 2. **Individual popular server** - Pick one built-in server from a short follow-up menu
 3. **Custom server** - Add your own stdio or HTTP MCP server
 
@@ -32,8 +33,8 @@ Ask a follow-up **AskUserQuestion**:
 
 **Options:**
 1. **Context7 only (Recommended)** - Zero-config docs/context server
-2. **Context7 + lean-ctx** - Docs/context plus token-saving compression layer
-3. **Full recommended bundle** - Context7, lean-ctx, Exa, and GitHub
+2. **Context7 + Exa** - Docs/context plus enhanced web search
+3. **Full recommended bundle** - Context7, Exa, Filesystem, and GitHub
 
 Map that choice to the server list you will configure.
 
@@ -45,17 +46,17 @@ Ask a follow-up **AskUserQuestion**:
 
 **Options:**
 1. **Context7 (Recommended)** - Documentation and code context from popular libraries
-2. **lean-ctx** - Token-saving compression layer for Read/Grep/Bash tools
-3. **More server choices** - Exa, GitHub, Azure DevOps, or the full recommended bundle
+2. **Exa Web Search** - Enhanced web search (replaces built-in websearch)
+3. **More server choices** - Filesystem, GitHub, or the full recommended bundle
 
 If the user chooses **More server choices**, ask one more **AskUserQuestion**:
 
 **Question:** "Which additional MCP option do you want?"
 
 **Options:**
-1. **Exa Web Search** - Enhanced web search (replaces built-in websearch)
-2. **GitHub / Azure DevOps** - Repository and project management integration
-3. **Full recommended bundle** - Configure Context7, lean-ctx, Exa, and GitHub together
+1. **Filesystem (Recommended)** - Extended file system access with additional capabilities
+2. **GitHub** - GitHub API integration for issues, PRs, and repository management
+3. **Full recommended bundle** - Configure Context7, Exa, Filesystem, and GitHub together
 
 ### Step 1.4: If the user chooses "Custom server"
 
@@ -74,9 +75,13 @@ Do you have an Exa API key?
 - Enter your API key, or type 'skip' to configure later
 ```
 
-### For lean-ctx:
-No API key required. Installs automatically. Saves 60-80% input tokens via caching and compression.
-More info: https://github.com/yvgude/lean-ctx
+### For Filesystem:
+Ask for allowed directories:
+```
+Which directories should the filesystem MCP have access to?
+Default: Current working directory
+Enter comma-separated paths, or press Enter for default
+```
 
 ### For GitHub:
 Ask for token:
@@ -87,64 +92,46 @@ Do you have a GitHub Personal Access Token?
 - Enter your token, or type 'skip' to configure later
 ```
 
-### For Azure DevOps:
-Ask for organization:
-```
-What is your Azure DevOps organization URL?
-- Example: https://dev.azure.com/my-org
-- Enter your organization URL, or type 'skip' to configure later
-```
-More info: https://github.com/microsoft/azure-devops-mcp
-
 ## Step 3: Add MCP Servers Using CLI
 
-Use the `copilot mcp add` command to configure each MCP server. The CLI automatically handles settings.json updates and merging.
+Use the `claude mcp add` command to configure each MCP server. The CLI automatically handles settings.json updates and merging.
 
 ### Context7 Configuration:
 ```bash
-copilot mcp add context7 -- npx -y @upstash/context7-mcp
+claude mcp add context7 -- npx -y @upstash/context7-mcp
 ```
 
 ### Exa Web Search Configuration:
 ```bash
-copilot mcp add -e EXA_API_KEY=<user-provided-key> exa -- npx -y exa-mcp-server
+claude mcp add -e EXA_API_KEY=<user-provided-key> exa -- npx -y exa-mcp-server
 ```
 
-### lean-ctx Configuration:
+### Filesystem Configuration:
 ```bash
-npm install -g lean-ctx-bin && lean-ctx setup
+claude mcp add filesystem -- npx -y @modelcontextprotocol/server-filesystem <allowed-directories>
 ```
-> Note: lean-ctx uses its own installer (`lean-ctx setup`) which auto-configures shell and all detected editors. It hooks into existing tools (Read, Grep, Bash) to compress and cache results automatically.
-
 
 ### GitHub Configuration:
 
 **Option 1: Docker (local)**
 ```bash
-copilot mcp add -e GITHUB_PERSONAL_ACCESS_TOKEN=<user-provided-token> github -- docker run -i --rm -e GITHUB_PERSONAL_ACCESS_TOKEN ghcr.io/github/github-mcp-server
+claude mcp add -e GITHUB_PERSONAL_ACCESS_TOKEN=<user-provided-token> github -- docker run -i --rm -e GITHUB_PERSONAL_ACCESS_TOKEN ghcr.io/github/github-mcp-server
 ```
 
 **Option 2: HTTP (remote)**
 ```bash
-copilot mcp add --transport http github https://api.githubcopilot.com/mcp/
+claude mcp add --transport http github https://api.githubcopilot.com/mcp/
 ```
 
 > Note: Docker option requires Docker installed. HTTP option is simpler but may have different capabilities.
 
-### Azure DevOps Configuration:
-```bash
-copilot mcp add azure-devops -- npx -y @microsoft/azure-devops-mcp
-```
-
-> Note: Requires Azure DevOps authentication. Run `az login` first or configure a PAT. See https://github.com/microsoft/azure-devops-mcp for setup details.
-
 ## Step 4: Verify Installation
 
 After configuration, verify the MCP servers are properly set up:
 
 ```bash
 # List configured MCP servers
-copilot mcp list
+claude mcp list
 ```
 
 This will display all configured MCP servers and their status.
@@ -158,27 +145,26 @@ CONFIGURED SERVERS:
 [List the servers that were configured]
 
 NEXT STEPS:
-1. Restart Copilot CLI for changes to take effect
+1. Restart Claude Code for changes to take effect
 2. The configured MCP tools will be available to all agents
-3. Run `copilot mcp list` to verify configuration
+3. Run `claude mcp list` to verify configuration
 
 USAGE TIPS:
 - Context7: Ask about library documentation (e.g., "How do I use React hooks?")
 - Exa: Use for web searches (e.g., "Search the web for latest TypeScript features")
-- lean-ctx: Automatic — compresses Read/Grep/Bash results to save tokens
+- Filesystem: Extended file operations beyond the working directory
 - GitHub: Interact with GitHub repos, issues, and PRs
-- Azure DevOps: Manage work items, pipelines, repos, and wikis
 
 TROUBLESHOOTING:
-- If MCP servers don't appear, run `copilot mcp list` to check status
+- If MCP servers don't appear, run `claude mcp list` to check status
 - Ensure you have Node.js 18+ installed for npx-based servers
 - For GitHub Docker option, ensure Docker is installed and running
 - Run /oh-my-copilot:omc-doctor to diagnose issues
 
 MANAGING MCP SERVERS:
-- Add more servers: /oh-my-copilot:mcp-setup or `copilot mcp add ...`
-- List servers: `copilot mcp list`
-- Remove a server: `copilot mcp remove <server-name>`
+- Add more servers: /oh-my-copilot:mcp-setup or `claude mcp add ...`
+- List servers: `claude mcp list`
+- Remove a server: `claude mcp remove <server-name>`
 ```
 
 ## Custom MCP Server
@@ -193,24 +179,24 @@ Ask for:
 5. Environment variables (optional, key=value pairs)
 6. HTTP headers (optional, for http transport only)
 
-Then construct and run the appropriate `copilot mcp add` command:
+Then construct and run the appropriate `claude mcp add` command:
 
 **For stdio servers:**
 ```bash
 # Without environment variables
-copilot mcp add <server-name> -- <command> [args...]
+claude mcp add <server-name> -- <command> [args...]
 
 # With environment variables
-copilot mcp add -e KEY1=value1 -e KEY2=value2 <server-name> -- <command> [args...]
+claude mcp add -e KEY1=value1 -e KEY2=value2 <server-name> -- <command> [args...]
 ```
 
 **For HTTP servers:**
 ```bash
 # Basic HTTP server
-copilot mcp add --transport http <server-name> <url>
+claude mcp add --transport http <server-name> <url>
 
 # HTTP server with headers
-copilot mcp add --transport http --header "Authorization: Bearer <token>" <server-name> <url>
+claude mcp add --transport http --header "Authorization: Bearer <token>" <server-name> <url>
 ```
 
 ### Company-context convention
@@ -220,7 +206,7 @@ If the custom server is meant to provide organization-specific reference materia
 Example local registration:
 
 ```bash
-copilot mcp add company-context -- node examples/vendor-mcp-server/server.mjs
+claude mcp add company-context -- node examples/vendor-mcp-server/server.mjs
 ```
 
 Then point OMC at the full tool name in `.copilot/omg.jsonc` or `~/.config/copilot-omg/config.jsonc`:
@@ -241,20 +227,19 @@ This remains advisory prompt context, not runtime enforcement.
 ### MCP Server Not Loading
 - Ensure Node.js 18+ is installed
 - Check that npx is available in PATH
-- Run `copilot mcp list` to verify server status
+- Run `claude mcp list` to verify server status
 - Check server logs for errors
 
 ### API Key Issues
 - Exa: Verify key at https://dashboard.exa.ai
 - GitHub: Ensure token has required scopes (repo, read:org)
-- Azure DevOps: Run `az login` or check PAT permissions
-- Re-run `copilot mcp add` with correct credentials if needed
+- Re-run `claude mcp add` with correct credentials if needed
 
 ### Agents Still Using Built-in Tools
-- Restart Copilot CLI after configuration
+- Restart Claude Code after configuration
 - The built-in websearch will be deprioritized when exa is configured
-- Run `copilot mcp list` to confirm servers are active
+- Run `claude mcp list` to confirm servers are active
 
 ### Removing or Updating a Server
-- Remove: `copilot mcp remove <server-name>`
+- Remove: `claude mcp remove <server-name>`
 - Update: Remove the old server, then add it again with new configuration

package/skills/omc-doctor/SKILL.md

@@ -110,7 +110,7 @@ ls -la "${COPILOT_CONFIG_DIR:-$HOME/.copilot}"/skills/ 2>/dev/null
 `architect.md`, `document-specialist.md`, `explore.md`, `executor.md`, `debugger.md`, `planner.md`, `analyst.md`, `critic.md`, `verifier.md`, `test-engineer.md`, `designer.md`, `writer.md`, `qa-tester.md`, `scientist.md`, `security-reviewer.md`, `code-reviewer.md`, `git-master.md`, `code-simplifier.md`
 
 **Known plugin skill names** (check skills/ for these):
-`ai-slop-cleaner`, `ask`, `autopilot`, `cancel`, `cccg`, `configure-notifications`, `deep-interview`, `deepinit`, `external-context`, `hud`, `learner`, `mcp-setup`, `omc-doctor`, `omc-setup`, `omc-teams`, `plan`, `project-session-manager`, `ralph`, `ralplan`, `release`, `sciomc`, `setup`, `skill`, `team`, `ultraqa`, `ultrawork`, `visual-verdict`, `writer-memory`
+`ai-slop-cleaner`, `ask`, `autopilot`, `cancel`, `cccg`, `configure-notifications`, `deep-interview`, `deepinit`, `external-context`, `hud`, `skillify`, `learner`, `mcp-setup`, `omc-doctor`, `omc-setup`, `omc-teams`, `plan`, `project-session-manager`, `ralph`, `ralplan`, `release`, `sciomc`, `setup`, `skill`, `team`, `ultraqa`, `ultrawork`, `visual-verdict`, `writer-memory`
 
 **Known plugin command names** (check commands/ for these):
 `ultrawork.md`, `deepsearch.md`

package/skills/omc-reference/SKILL.md

@@ -42,9 +42,9 @@ Prefix: `oh-my-copilot:`. See `agents/*.md` for full prompts.
 
 ### External AI / orchestration
 - `/team N:executor "task"`
-- `omcp team N:codex|gemini "..."`
-- `omcp ask <claude|codex|gemini>`
-- `/cccg`
+- `omc team N:codex|gemini "..."`
+- `omc ask <claude|codex|gemini>`
+- `/ccg`
 
 ### OMC state
 - `state_read`, `state_write`, `state_clear`, `state_list_active`, `state_get_status`
@@ -73,7 +73,7 @@ Invoke built-in workflows via `/oh-my-copilot:<name>`.
 - `ultrawork` — high-throughput parallel execution
 - `visual-verdict` — structured visual QA verdicts
 - `team` — coordinated team orchestration
-- `cccg` — Copilot + Claude + Codex + Gemini quad-model orchestration
+- `ccg` — Codex + Gemini + Claude synthesis lane
 - `ultraqa` — QA cycle: test, verify, fix, repeat
 - `omc-plan` — planning workflow and `/plan`-safe alias
 - `ralplan` — consensus planning workflow
@@ -84,13 +84,13 @@ Invoke built-in workflows via `/oh-my-copilot:<name>`.
 - `ai-slop-cleaner` — regression-safe cleanup workflow
 
 ### Utility skills
-- `ask`, `cancel`, `note`, `learner`, `omc-setup`, `mcp-setup`, `hud`, `omc-doctor`, `trace`, `release`, `project-session-manager`, `skill`, `writer-memory`, `configure-notifications`
+- `ask`, `cancel`, `note`, `skillify`, `learner` (deprecated alias), `omc-setup`, `mcp-setup`, `hud`, `omc-doctor`, `trace`, `release`, `project-session-manager`, `skill`, `writer-memory`, `configure-notifications`
 
 ### Keyword triggers kept compact in CLAUDE.md
 - `"autopilot"→autopilot`
 - `"ralph"→ralph`
 - `"ulw"→ultrawork`
-- `"cccg"→cccg`
+- `"ccg"→ccg`
 - `"ralplan"→ralplan`
 - `"deep interview"→deep-interview`
 - `"deslop" / "anti-slop"→ai-slop-cleaner`

package/skills/omc-setup/SKILL.md

@@ -1,6 +1,7 @@
 ---
 name: omc-setup
 description: Install or refresh oh-my-copilot for plugin, npm, and local-dev setups from the canonical setup flow
+level: 2
 ---
 
 # OMC Setup
@@ -9,14 +10,14 @@ This is the **only command you need to learn**. After running this, everything e
 
 **When this skill is invoked, immediately execute the workflow below. Do not only restate or summarize these instructions back to the user.**
 
-Note: All `~/.copilot/...` paths in this guide respect `COPILOT_CONFIG_DIR` when that environment variable is set.
+Note: All `~/.claude/...` paths in this guide respect `COPILOT_CONFIG_DIR` when that environment variable is set.
 
 ## Best-Fit Use
 
 Choose this setup flow when the user wants to **install, refresh, or repair OMC itself**.
 
 - Marketplace/plugin install users should land here after `/plugin install oh-my-copilot`
-- npm users should land here after `npm i -g oh-my-copilot@latest`
+- npm users should land here after `npm i -g oh-my-claude-sisyphus@latest`
 - local-dev and worktree users should land here after updating the checked-out repo and rerunning setup
 
 ## Flag Parsing
@@ -37,15 +38,15 @@ OMC Setup - Configure oh-my-copilot
 
 USAGE:
   /oh-my-copilot:omc-setup           Run initial setup wizard (or update if already configured)
-  /oh-my-copilot:omc-setup --local   Configure local project (.copilot/copilot-instructions.md)
-  /oh-my-copilot:omc-setup --global  Configure global settings (~/.copilot/copilot-instructions.md)
+  /oh-my-copilot:omc-setup --local   Configure local project (.claude/CLAUDE.md)
+  /oh-my-copilot:omc-setup --global  Configure global settings (~/.claude/CLAUDE.md)
   /oh-my-copilot:omc-setup --force   Force full setup wizard even if already configured
   /oh-my-copilot:omc-setup --help    Show this help
 
 MODES:
   Initial Setup (no flags)
     - Interactive wizard for first-time setup
-    - Configures copilot-instructions.md (local or global)
+    - Configures CLAUDE.md (local or global)
     - Sets up HUD statusline
     - Checks for updates
     - Offers MCP server configuration
@@ -53,15 +54,17 @@ MODES:
     - If already configured, offers quick update option
 
   Local Configuration (--local)
-    - Downloads fresh copilot-instructions.md to ./.copilot/
-    - Backs up existing copilot-instructions.md to .copilot/copilot-instructions.md.backup.YYYY-MM-DD
+    - Downloads fresh CLAUDE.md to ./.claude/
+    - Backs up existing CLAUDE.md to .claude/CLAUDE.md.backup.YYYY-MM-DD
     - Project-specific settings
     - Use this to update project config after OMC upgrades
 
   Global Configuration (--global)
-    - Downloads fresh copilot-instructions.md to ~/.copilot/
-    - Backs up existing copilot-instructions.md to ~/.copilot/copilot-instructions.md.backup.YYYY-MM-DD
-    - Applies to all Copilot CLI sessions
+    - Downloads fresh CLAUDE.md to ~/.claude/
+    - Backs up existing CLAUDE.md to ~/.claude/CLAUDE.md.backup.YYYY-MM-DD
+    - Default: explicitly overwrites ~/.claude/CLAUDE.md so plain `claude` also uses OMC
+    - Optional preserve mode keeps the user's base `CLAUDE.md` and installs OMC into `CLAUDE-omc.md` for `omc` launches
+    - Applies to all Claude Code sessions
     - Cleans up legacy hooks
     - Use this to update global config after OMC upgrades
 
@@ -71,30 +74,12 @@ MODES:
     - Use when you want to reconfigure preferences
 
 EXAMPLES:
-  /oh-my-copilot:omc-setup           # First time setup (or update copilot-instructions.md if configured)
+  /oh-my-copilot:omc-setup           # First time setup (or update CLAUDE.md if configured)
   /oh-my-copilot:omc-setup --local   # Update this project
   /oh-my-copilot:omc-setup --global  # Update all projects
   /oh-my-copilot:omc-setup --force   # Re-run full setup wizard
 
-For more info: https://github.com/RobinNorberg/oh-my-copilot
-```
-
-## Step 0: Discover Plugin Root
-
-Before anything else, resolve `COPILOT_PLUGIN_ROOT`. Run this command and use the result for all subsequent `${COPILOT_PLUGIN_ROOT}` references:
-
-```bash
-# Find the oh-my-copilot plugin root
-for d in   "${COPILOT_PLUGIN_ROOT:-}"   "${COPILOT_CONFIG_DIR:-$HOME/.copilot}/installed-plugins/omcp/oh-my-copilot"   "${COPILOT_CONFIG_DIR:-$HOME/.copilot}/installed-plugins/_direct/oh-my-copilot"   "$(npm root -g 2>/dev/null)/oh-my-copilot"   ; do
-  [ -n "$d" ] && [ -f "$d/skills/omc-setup/SKILL.md" ] && { echo "$d"; break; }
-done
-```
-
-Store the output as `COPILOT_PLUGIN_ROOT` for the rest of this setup. If no path is found, tell the user to install first:
-```
-oh-my-copilot plugin not found. Install it first:
-  /plugin marketplace add https://github.com/RobinNorberg/oh-my-copilot
-  /plugin install oh-my-copilot@omcp
+For more info: https://github.com/Yeachan-Heo/oh-my-copilot
 ```
 
 ## Pre-Setup Check: Already Configured?
@@ -126,14 +111,14 @@ Use AskUserQuestion to prompt:
 **Question:** "OMC is already configured. What would you like to do?"
 
 **Options:**
-1. **Update copilot-instructions.md only** - Download latest copilot-instructions.md without re-running full setup
+1. **Update CLAUDE.md only** - Download latest CLAUDE.md without re-running full setup
 2. **Run full setup again** - Go through the complete setup wizard
 3. **Cancel** - Exit without changes
 
-**If user chooses "Update copilot-instructions.md only":**
-- Detect if local (.copilot/copilot-instructions.md) or global (~/.copilot/copilot-instructions.md) config exists
-- If local exists, run: `bash "${COPILOT_PLUGIN_ROOT}/scripts/setup-copilot-instructions.sh" local`
-- If only global exists, run: `bash "${COPILOT_PLUGIN_ROOT}/scripts/setup-copilot-instructions.sh" global`
+**If user chooses "Update CLAUDE.md only":**
+- Detect if local (.claude/CLAUDE.md) or global (~/.claude/CLAUDE.md) config exists
+- If local exists, run: `bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-claude-md.sh" local`
+- If only global exists, run: `bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-claude-md.sh" global`
 - Skip all other steps
 - Report success and exit
 
@@ -152,7 +137,7 @@ If user passes `--force` flag, skip this check and proceed directly to setup.
 Before starting any phase, check for existing state:
 
 ```bash
-bash "${COPILOT_PLUGIN_ROOT}/scripts/setup-progress.sh" resume
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-progress.sh" resume
 ```
 
 If state exists (output is not "fresh"), use AskUserQuestion to prompt:
@@ -165,64 +150,35 @@ If state exists (output is not "fresh"), use AskUserQuestion to prompt:
 
 If user chooses "Start fresh":
 ```bash
-bash "${COPILOT_PLUGIN_ROOT}/scripts/setup-progress.sh" clear
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-progress.sh" clear
 ```
 
 ## Phase Execution
 
 ### For `--local` or `--global` flags:
-Read the file at `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/01-install-copilot-instructions.md` and follow its instructions.
+Read the file at `${CLAUDE_PLUGIN_ROOT}/skills/omc-setup/phases/01-install-claude-md.md` and follow its instructions.
 (The phase file handles early exit for flag mode.)
 
 ### For full setup (default or --force):
+Execute phases sequentially. For each phase, read the corresponding file and follow its instructions:
 
-#### Setup Mode Selection
-
-Before executing phases, ask the user which setup mode they prefer:
-
-Use AskUserQuestion to prompt:
-
-**Question:** "How would you like to configure oh-my-copilot?"
-
-**Options:**
-1. **Quick Setup (Recommended)** - Apply sensible defaults and jump straight to MCP server configuration. You can customize later with `/omc-setup --force`.
-2. **Step-by-step Setup** - Walk through each option individually (local/global, HUD, CLI install, team defaults, etc.)
-
-Set `SETUP_MODE` to `quick` or `interactive` based on user's choice.
-
-#### Quick Setup Mode (SETUP_MODE=quick)
-
-Apply all recommended defaults automatically with minimal prompts:
-
-1. **Phase 1 - Install copilot-instructions.md (global)**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/01-install-copilot-instructions.md` and follow its instructions, but **skip the AskUserQuestion** — use `CONFIG_TARGET=global` automatically.
-
-2. **Phase 2 - Environment Configuration (auto)**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/02-configure.md` and follow its instructions in **quick mode** — apply all defaults without interactive prompts (see phase file for quick-mode behavior).
-
-3. **Phase 3 - Integration Setup (MCP focus)**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/03-integrations.md` and follow its instructions — in quick mode, skip team customization and go straight to MCP server configuration.
-
-4. **Phase 4 - Completion**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/04-welcome.md` and follow its instructions.
-
-#### Step-by-step Setup Mode (SETUP_MODE=interactive)
-
-Execute all phases with full interactive prompts:
-
-1. **Phase 1 - Install copilot-instructions.md**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/01-install-copilot-instructions.md` and follow its instructions.
+1. **Phase 1 - Install CLAUDE.md**: Read `${CLAUDE_PLUGIN_ROOT}/skills/omc-setup/phases/01-install-claude-md.md` and follow its instructions.
 
-2. **Phase 2 - Environment Configuration**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/02-configure.md` and follow its instructions in **interactive mode**.
+2. **Phase 2 - Environment Configuration**: Read `${CLAUDE_PLUGIN_ROOT}/skills/omc-setup/phases/02-configure.md` and follow its instructions. Phase 2 must delegate HUD/statusLine setup to the `hud` skill; do not generate or patch `statusLine` paths inline here.
 
-3. **Phase 3 - Integration Setup**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/03-integrations.md` and follow its instructions.
+3. **Phase 3 - Integration Setup**: Read `${CLAUDE_PLUGIN_ROOT}/skills/omc-setup/phases/03-integrations.md` and follow its instructions.
 
-4. **Phase 4 - Completion**: Read `${COPILOT_PLUGIN_ROOT}/skills/omc-setup/phases/04-welcome.md` and follow its instructions.
+4. **Phase 4 - Completion**: Read `${CLAUDE_PLUGIN_ROOT}/skills/omc-setup/phases/04-welcome.md` and follow its instructions.
 
 ## Graceful Interrupt Handling
 
-**IMPORTANT**: This setup process saves progress after each phase via `${COPILOT_PLUGIN_ROOT}/scripts/setup-progress.sh`. If interrupted (Ctrl+C or connection loss), the setup can resume from where it left off.
+**IMPORTANT**: This setup process saves progress after each phase via `${CLAUDE_PLUGIN_ROOT}/scripts/setup-progress.sh`. If interrupted (Ctrl+C or connection loss), the setup can resume from where it left off.
 
 ## Keeping Up to Date
 
 After installing oh-my-copilot updates (via npm or plugin update):
 
-**Automatic**: Just run `/oh-my-copilot:omc-setup` - it will detect you've already configured and offer a quick "Update copilot-instructions.md only" option that skips the full wizard.
+**Automatic**: Just run `/oh-my-copilot:omc-setup` - it will detect you've already configured and offer a quick "Update CLAUDE.md only" option that skips the full wizard.
 
 **Manual options**:
 - `/oh-my-copilot:omc-setup --local` to update project config only

package/skills/omc-setup/phases/01-install-claude-md.md

@@ -0,0 +1,97 @@
+# Phase 1: Install CLAUDE.md
+
+## Determine Configuration Target
+
+If `--local` flag was passed, set `CONFIG_TARGET=local`.
+If `--global` flag was passed, set `CONFIG_TARGET=global`.
+
+Otherwise (initial setup wizard), use AskUserQuestion to prompt:
+
+**Question:** "Where should I configure oh-my-copilot?"
+
+**Options:**
+1. **Local (this project)** - Creates `.claude/CLAUDE.md` in current project directory. Best for project-specific configurations.
+2. **Global (all projects)** - Creates `~/.claude/CLAUDE.md` for all Claude Code sessions. Best for consistent behavior everywhere.
+
+Set `CONFIG_TARGET` to `local` or `global` based on user's choice.
+
+If `CONFIG_TARGET=global` and `~/.claude/CLAUDE.md` already exists without OMC markers, ask a second explicit question before running setup:
+
+**Question:** "Global setup will change your base Claude config. Which behavior do you want?"
+
+**Options (default first):**
+1. **Overwrite base CLAUDE.md (Recommended)** - plain `claude` and `omc` both use OMC globally.
+2. **Keep base CLAUDE.md; use OMC only through `omc`** - preserve the user's base file, install OMC into `CLAUDE-omc.md`, and let `omc` force-load that companion config at launch.
+
+Set `GLOBAL_INSTALL_STYLE=overwrite` or `preserve` based on the user's choice. If you did not ask this question, default `GLOBAL_INSTALL_STYLE=overwrite`.
+
+## Download and Install CLAUDE.md
+
+**MANDATORY**: Always run this command. Do NOT skip. Do NOT use the Write tool. Let the setup script choose the safest canonical source (bundled `docs/CLAUDE.md` first, GitHub fallback only if needed).
+
+```bash
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-claude-md.sh" <CONFIG_TARGET> [GLOBAL_INSTALL_STYLE]
+```
+
+Replace `<CONFIG_TARGET>` with `local` or `global`. For local installs, omit the optional style argument. For global installs, pass `overwrite` or `preserve` when you know the user's choice; otherwise let the script default to `overwrite`.
+
+The script must install the canonical `docs/CLAUDE.md` content and preserve the required
+`<!-- OMC:START -->` / `<!-- OMC:END -->` markers. Do **not** hand-write, summarize, or
+partially reconstruct CLAUDE.md.
+
+After running the script, verify the target file contains both markers. If marker validation
+fails, stop and report the failure instead of writing CLAUDE.md manually.
+
+For `local` installs inside a git repository, the script also seeds `.git/info/exclude` with an OMC block that re-includes `.omcp/`, ignores local `.omcp/*` artifacts by default, and preserves `.omcp/skills/` for project skills you intend to commit.
+
+**FALLBACK** if curl fails:
+Tell user to manually download from:
+https://raw.githubusercontent.com/Yeachan-Heo/oh-my-copilot/main/docs/CLAUDE.md
+
+**Note**: The downloaded CLAUDE.md includes Context Persistence instructions with `<remember>` tags for surviving conversation compaction.
+
+**Note**: Preserve mode installs OMC into a companion `CLAUDE-omc.md` with a small managed import block, and `omc` launch force-loads that companion config without changing plain `claude`.
+
+## Report Success
+
+If `CONFIG_TARGET` is `local`:
+```
+OMC Project Configuration Complete
+- CLAUDE.md: Updated with latest configuration from GitHub at ./.claude/CLAUDE.md
+- Git excludes: Added local `.omcp/*` ignore rules to `.git/info/exclude` (keeps `.omcp/skills/` trackable for committed project skills)
+- Backup: Previous CLAUDE.md backed up (if existed)
+- Scope: PROJECT - applies only to this project
+- Hooks: Provided by plugin (no manual installation needed)
+- Agents: 28+ available (base + tiered variants)
+- Model routing: Haiku/Sonnet/Opus based on task complexity
+
+Note: This configuration is project-specific and won't affect other projects or global settings.
+```
+
+If `CONFIG_TARGET` is `global`:
+```
+OMC Global Configuration Complete
+- CLAUDE.md: Updated at ~/.claude/CLAUDE.md, or preserved with explicit preserve mode
+- Companion: May install ~/.claude/CLAUDE-omc.md when preserve mode is chosen
+- Backup: Previous CLAUDE.md backed up (if existed)
+- Scope: GLOBAL - applies to all Claude Code sessions
+- Hooks: Provided by plugin (no manual installation needed)
+- Agents: 28+ available (base + tiered variants)
+- Model routing: Haiku/Sonnet/Opus based on task complexity
+
+Note: Hooks are now managed by the plugin system automatically. No manual hook installation required.
+```
+
+## Save Progress
+
+```bash
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-progress.sh" save 2 <CONFIG_TARGET>
+```
+
+## Early Exit for Flag Mode
+
+If `--local` or `--global` flag was used, clear state and **STOP HERE**:
+```bash
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-progress.sh" clear
+```
+Do not continue to Phase 2 or other phases.