claudecode-omc 5.3.0 → 5.5.0

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

@@ -1,6 +1,7 @@
 ---
 name: hud
 description: Configure HUD display options (layout, presets, display elements)
+argument-hint: "[setup|minimal|focused|full|status]"
 role: config-writer  # DOCUMENTATION ONLY - This skill writes to ~/.claude/ paths
 scope: ~/.claude/**  # DOCUMENTATION ONLY - Allowed write scope
 level: 2
@@ -45,112 +46,25 @@ node -e "const p=require('path'),f=require('fs'),d=process.env.CLAUDE_CONFIG_DIR
 node -e "const p=require('path'),f=require('fs'),d=process.env.CLAUDE_CONFIG_DIR||p.join(require('os').homedir(),'.claude'),b=p.join(d,'plugins','cache','omc','oh-my-claudecode');try{const v=f.readdirSync(b).filter(x=>/^\d/.test(x)).sort((a,c)=>a.localeCompare(c,void 0,{numeric:true}));if(v.length===0){console.log('Plugin not installed - run: /plugin install oh-my-claudecode');process.exit()}const l=v[v.length-1],h=p.join(b,l,'dist','hud','index.js');console.log('Version:',l);console.log(f.existsSync(h)?'READY':'NOT_FOUND - try reinstalling: /plugin install oh-my-claudecode')}catch{console.log('Plugin not installed - run: /plugin install oh-my-claudecode')}"
 ```
 
-**Step 3:** If omc-hud.mjs is MISSING or argument is `setup`, create the HUD directory and script:
+**Step 3:** If omc-hud.mjs is MISSING or argument is `setup`, install the HUD wrapper and its dependency from the canonical template:
 
-First, create the directory:
 ```bash
-node -e "require('fs').mkdirSync(require('path').join(process.env.CLAUDE_CONFIG_DIR||require('path').join(require('os').homedir(),'.claude'),'hud'),{recursive:true})"
+HUD_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hud"
+mkdir -p "$HUD_DIR/lib"
+cp "${CLAUDE_PLUGIN_ROOT}/scripts/lib/hud-wrapper-template.txt" "$HUD_DIR/omc-hud.mjs"
+cp "${CLAUDE_PLUGIN_ROOT}/scripts/lib/config-dir.mjs" "$HUD_DIR/lib/config-dir.mjs"
 ```
 
-Then, use the Write tool to create `~/.claude/hud/omc-hud.mjs` with this exact content:
-
-```javascript
-#!/usr/bin/env node
-/**
- * OMC HUD - Statusline Script
- * Wrapper that imports from dev paths, plugin cache, or npm package
- */
-
-import { existsSync, readdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { pathToFileURL } from "node:url";
-
-async function main() {
-  const home = homedir();
-  let pluginCacheVersion = null;
-  let pluginCacheDir = null;
-
-  // 1. Development paths (only when OMC_DEV=1)
-  if (process.env.OMC_DEV === "1") {
-    const devPaths = [
-      join(home, "Workspace/oh-my-claudecode/dist/hud/index.js"),
-      join(home, "workspace/oh-my-claudecode/dist/hud/index.js"),
-      join(home, "projects/oh-my-claudecode/dist/hud/index.js"),
-    ];
-
-    for (const devPath of devPaths) {
-      if (existsSync(devPath)) {
-        try {
-          await import(pathToFileURL(devPath).href);
-          return;
-        } catch { /* continue */ }
-      }
-    }
-  }
-
-  // 2. Plugin cache (for production installs)
-  // Respect CLAUDE_CONFIG_DIR so installs under a custom config dir are found
-  const configDir = process.env.CLAUDE_CONFIG_DIR || join(home, ".claude");
-  const pluginCacheBase = join(configDir, "plugins", "cache", "omc", "oh-my-claudecode");
-  if (existsSync(pluginCacheBase)) {
-    try {
-      const versions = readdirSync(pluginCacheBase);
-      if (versions.length > 0) {
-        // Filter to only versions with built dist/hud/index.js
-        // This prevents picking an unbuilt new version after plugin update
-        const builtVersions = versions.filter(version => {
-          const pluginPath = join(pluginCacheBase, version, "dist/hud/index.js");
-          return existsSync(pluginPath);
-        });
-
-        if (builtVersions.length > 0) {
-          const latestVersion = builtVersions.sort((a, b) => a.localeCompare(b, undefined, { numeric: true })).reverse()[0];
-          pluginCacheVersion = latestVersion;
-          pluginCacheDir = join(pluginCacheBase, latestVersion);
-          const pluginPath = join(pluginCacheDir, "dist/hud/index.js");
-          await import(pathToFileURL(pluginPath).href);
-          return;
-        }
-      }
-    } catch { /* continue */ }
-  }
-
-  // 3. npm package (global or local install)
-  try {
-    await import("oh-my-claudecode/dist/hud/index.js");
-    return;
-  } catch { /* continue */ }
-
-  // 4. Fallback: provide detailed error message with fix instructions
-  if (pluginCacheDir && existsSync(pluginCacheDir)) {
-    // Plugin exists but dist/ folder is missing - needs build
-    const distDir = join(pluginCacheDir, "dist");
-    if (!existsSync(distDir)) {
-      console.log(`[OMC HUD] Plugin installed but not built. Run: cd "${pluginCacheDir}" && npm install && npm run build`);
-    } else {
-      console.log(`[OMC HUD] Plugin dist/ exists but HUD not found. Run: cd "${pluginCacheDir}" && npm run build`);
-    }
-  } else if (existsSync(pluginCacheBase)) {
-    // Plugin cache directory exists but no built versions found
-    console.log("[OMC HUD] Plugin cache found but no built versions. Run: /oh-my-claudecode:omc-setup");
-  } else {
-    // No plugin installation found at all
-    console.log("[OMC HUD] Plugin not installed. Run: /oh-my-claudecode:omc-setup");
-  }
-}
-
-main();
-```
+**IMPORTANT:** Always copy from the canonical template at `scripts/lib/hud-wrapper-template.txt`. Do NOT write the wrapper content inline — the template is the single source of truth and is guarded by drift tests (`src/__tests__/hud-wrapper-template-sync.test.ts`, `src/__tests__/paths-consistency.test.ts`).
 
-**Step 3:** Make it executable (Unix only, skip on Windows):
+**Step 4:** Make it executable (Unix only, skip on Windows):
 ```bash
 node -e "if(process.platform==='win32'){console.log('Skipped (Windows)')}else{require('fs').chmodSync(require('path').join(process.env.CLAUDE_CONFIG_DIR||require('path').join(require('os').homedir(),'.claude'),'hud','omc-hud.mjs'),0o755);console.log('Done')}"
 ```
 
-**Step 4:** Update settings.json to use the HUD:
+**Step 5:** Update settings.json to use the HUD:
 
-Read `~/.claude/settings.json`, then update/add the `statusLine` field.
+Read `${CLAUDE_CONFIG_DIR:-~/.claude}/settings.json`, then update/add the `statusLine` field.
 
 **IMPORTANT:** Do not use `~` in the command. On Unix, use `$HOME` to keep the path portable across machines. On Windows, use an absolute path because Windows does not expand `~` in shell commands.
 
@@ -166,7 +80,7 @@ Then set the `statusLine` field. On Unix it should stay portable and look like:
 {
   "statusLine": {
     "type": "command",
-    "command": "node $HOME/.claude/hud/omc-hud.mjs"
+    "command": "node ${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hud/omc-hud.mjs"
   }
 }
 ```
@@ -183,12 +97,12 @@ On Windows the path uses forward slashes (not backslashes):
 
 Use the Edit tool to add/update this field while preserving other settings.
 
-**Step 5:** Clean up old HUD scripts (if any):
+**Step 6:** Clean up old HUD scripts (if any):
 ```bash
-node -e "const p=require('path'),f=require('fs'),d=process.env.CLAUDE_CONFIG_DIR||p.join(require('os').homedir(),'.claude'),t=p.join(d,'hud','omc-hud.mjs');try{if(f.existsSync(t)){f.unlinkSync(t);console.log('Removed legacy script')}else{console.log('No legacy script found')}}catch{}"
+node -e "const p=require('path'),f=require('fs'),d=process.env.CLAUDE_CONFIG_DIR||p.join(require('os').homedir(),'.claude'),t=p.join(d,'hud','omc-hud.js');try{if(f.existsSync(t)){f.unlinkSync(t);console.log('Removed legacy omc-hud.js')}else{console.log('No legacy script found')}}catch{}"
 ```
 
-**Step 6:** Tell the user to restart Claude Code for changes to take effect.
+**Step 7:** Tell the user to restart Claude Code for changes to take effect.
 
 ## Display Presets
 
@@ -277,6 +191,7 @@ You can manually edit the config file. Each option can be set individually - any
     "sessionHealth": true,
     "useBars": true,
     "showCallCounts": true,
+    "callCountsFormat": "auto",
     "safeMode": true,
     "maxOutputLines": 4
   },
@@ -294,6 +209,13 @@ You can manually edit the config file. Each option can be set individually - any
 }
 ```
 
+### callCountsFormat
+
+Controls the call-count badge icon style:
+- `"auto"` (default): emoji on macOS/Linux, ASCII on Windows/WSL
+- `"emoji"`: force `🔧 🤖 ⚡`
+- `"ascii"`: force `T: A: S:`
+
 ### safeMode
 
 When `safeMode` is `true` (default), the HUD strips ANSI codes and uses ASCII-only output to prevent terminal rendering corruption during concurrent updates. This is especially important on Windows and when using terminal multiplexers.
@@ -320,7 +242,7 @@ If the HUD is not showing:
 {
   "statusLine": {
     "type": "command",
-    "command": "node $HOME/.claude/hud/omc-hud.mjs"
+    "command": "node ${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hud/omc-hud.mjs"
   }
 }
 ```

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

@@ -109,12 +109,37 @@ This classification ensures expertise can be updated independently without desta
 
 ### Step 4: Save Location
 
-- **User-level**: ~/.claude/skills/omc-learned/ - Rare. Only for truly portable insights.
-- **Project-level**: .omc/skills/ - Default. Version-controlled with repo.
+- **User-level**: `${CLAUDE_CONFIG_DIR:-~/.claude}/skills/omc-learned/<skill-name>.md` - Rare. Only for truly portable insights.
+- **Project-level**: `.omc/skills/<skill-name>.md` - Default. Version-controlled with repo.
+
+### Required File Format
+
+Every learned skill file MUST start with YAML frontmatter so learned-skill flat-file discovery can load it.
+Do **not** write plain markdown without frontmatter.
+
+Minimum required frontmatter:
+
+```yaml
+---
+name: <skill-name>
+description: <one-line description>
+triggers:
+  - <trigger-1>
+  - <trigger-2>
+---
+```
 
 ### Skill Body Template
 
 ```markdown
+---
+name: <skill-name>
+description: <one-line description>
+triggers:
+  - <trigger-1>
+  - <trigger-2>
+---
+
 # [Skill Name]
 
 ## The Insight

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

@@ -12,19 +12,55 @@ Configure Model Context Protocol (MCP) servers to extend Claude Code's capabilit
 
 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: Show Available MCP Servers
+## Step 1: Choose a Setup Path
 
-Present the user with available MCP server options using AskUserQuestion:
+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.
 
-**Question:** "Which MCP server would you like to configure?"
+### 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 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
+
+### Step 1.2: If the user chooses "Recommended starter setup"
+
+Ask a follow-up **AskUserQuestion**:
+
+**Question:** "Which recommended MCP bundle should I configure?"
+
+**Options:**
+1. **Context7 only (Recommended)** - Zero-config docs/context server
+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.
+
+### Step 1.3: If the user chooses "Individual popular server"
+
+Ask a follow-up **AskUserQuestion**:
+
+**Question:** "Which server should I configure first?"
 
 **Options:**
-1. **Context7** - Documentation and code context from popular libraries
+1. **Context7 (Recommended)** - Documentation and code context from popular libraries
 2. **Exa Web Search** - Enhanced web search (replaces built-in websearch)
-3. **Filesystem** - Extended file system access with additional capabilities
-4. **GitHub** - GitHub API integration for issues, PRs, and repository management
-5. **All of the above** - Configure all recommended MCP servers
-6. **Custom** - Add a custom MCP server
+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. **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"
+
+Skip directly to the **Custom MCP Server** section below.
 
 ## Step 2: Gather Required Information
 
@@ -163,6 +199,29 @@ claude mcp add --transport http <server-name> <url>
 claude mcp add --transport http --header "Authorization: Bearer <token>" <server-name> <url>
 ```
 
+### Company-context convention
+
+If the custom server is meant to provide organization-specific reference material to OMC workflows, prefer a single tool named `get_company_context` that returns markdown via `{ context: string }`.
+
+Example local registration:
+
+```bash
+claude mcp add company-context -- node examples/vendor-mcp-server/server.mjs
+```
+
+Then point OMC at the full tool name in `.claude/omc.jsonc` or `~/.config/claude-omc/config.jsonc`:
+
+```jsonc
+{
+  "companyContext": {
+    "tool": "mcp__company-context__get_company_context",
+    "onError": "warn"
+  }
+}
+```
+
+This remains advisory prompt context, not runtime enforcement.
+
 ## Common Issues
 
 ### MCP Server Not Loading

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

@@ -27,10 +27,10 @@ npm view oh-my-claudecode version 2>/dev/null || echo "Latest: (unavailable)"
 
 ### Step 2: Check for Legacy Hooks in settings.json
 
-Read both `~/.claude/settings.json` (profile-level) and `./.claude/settings.json` (project-level) and check if there's a `"hooks"` key with entries like:
-- `bash $HOME/.claude/hooks/keyword-detector.sh`
-- `bash $HOME/.claude/hooks/persistent-mode.sh`
-- `bash $HOME/.claude/hooks/session-start.sh`
+Read both `${CLAUDE_CONFIG_DIR:-~/.claude}/settings.json` (profile-level) and `./.claude/settings.json` (project-level) and check if there's a `"hooks"` key with entries like:
+- `bash ${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hooks/keyword-detector.sh`
+- `bash ${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hooks/persistent-mode.sh`
+- `bash ${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hooks/session-start.sh`
 
 **Diagnosis**:
 - If found: CRITICAL - legacy hooks causing duplicates
@@ -38,7 +38,7 @@ Read both `~/.claude/settings.json` (profile-level) and `./.claude/settings.json
 ### Step 3: Check for Legacy Bash Hook Scripts
 
 ```bash
-ls -la ~/.claude/hooks/*.sh 2>/dev/null
+ls -la "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/hooks/*.sh 2>/dev/null
 ```
 
 **Diagnosis**:
@@ -48,19 +48,22 @@ ls -la ~/.claude/hooks/*.sh 2>/dev/null
 
 ```bash
 # Check if CLAUDE.md exists
-ls -la ~/.claude/CLAUDE.md 2>/dev/null
+ls -la "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/CLAUDE.md 2>/dev/null
 
 # Check for OMC markers (<!-- OMC:START --> is the canonical marker)
-grep -q "<!-- OMC:START -->" ~/.claude/CLAUDE.md 2>/dev/null && echo "Has OMC config" || echo "Missing OMC config in CLAUDE.md"
+grep -q "<!-- OMC:START -->" "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/CLAUDE.md" 2>/dev/null && echo "Has OMC config" || echo "Missing OMC config in CLAUDE.md"
+
+# Check CLAUDE.md (or deterministic companion) version marker and compare with latest installed plugin cache version
+node -e "const p=require('path'),f=require('fs'),h=require('os').homedir(),d=process.env.CLAUDE_CONFIG_DIR||p.join(h,'.claude');const base=p.join(d,'CLAUDE.md');let baseContent='';try{baseContent=f.readFileSync(base,'utf8')}catch{};let candidates=[base];let referenced='';const importMatch=baseContent.match(/CLAUDE-[^ )]*\\.md/);if(importMatch){referenced=p.join(d,importMatch[0]);candidates.push(referenced)}else{const defaultCompanion=p.join(d,'CLAUDE-omc.md');if(f.existsSync(defaultCompanion))candidates.push(defaultCompanion);try{const others=f.readdirSync(d).filter(n=>/^CLAUDE-.*\\.md$/i.test(n)).sort().map(n=>p.join(d,n));for(const o of others){if(candidates.includes(o)===false)candidates.push(o)}}catch{}};let claudeV='(missing)';let claudeSource='(none)';for(const file of candidates){try{const c=f.readFileSync(file,'utf8');const m=c.match(/<!--\\s*OMC:VERSION:([^\\s]+)\\s*-->/i);if(m){claudeV=m[1];claudeSource=file;break}}catch{}};if(claudeV==='(missing)'&&candidates.length>0){claudeV='(missing marker)';claudeSource='scanned deterministic CLAUDE sources';};let pluginV='(none)';try{const b=p.join(d,'plugins','cache','omc','oh-my-claudecode');const v=f.readdirSync(b).filter(x=>/^\\d/.test(x)).sort((a,c)=>a.localeCompare(c,void 0,{numeric:true}));pluginV=v.length?v[v.length-1]:'(none)';}catch{};console.log('CLAUDE.md OMC version:',claudeV);console.log('OMC version source:',claudeSource);console.log('Latest cached plugin version:',pluginV);if(claudeV==='(missing)'||claudeV==='(missing marker)'||pluginV==='(none)'){console.log('VERSION CHECK SKIPPED: missing CLAUDE marker or plugin cache')}else if(claudeV===pluginV){console.log('VERSION MATCH: CLAUDE and plugin cache are aligned')}else{console.log('VERSION DRIFT: CLAUDE.md and plugin versions differ')}"
 
 # Check companion files for file-split pattern (e.g. CLAUDE-omc.md)
-find "$HOME/.claude" -maxdepth 1 -type f -name 'CLAUDE-*.md' -print 2>/dev/null
+find "${CLAUDE_CONFIG_DIR:-$HOME/.claude}" -maxdepth 1 -type f -name 'CLAUDE-*.md' -print 2>/dev/null
 while IFS= read -r f; do
   grep -q "<!-- OMC:START -->" "$f" 2>/dev/null && echo "Has OMC config in companion: $f"
-done < <(find "$HOME/.claude" -maxdepth 1 -type f -name 'CLAUDE-*.md' -print 2>/dev/null)
+done < <(find "${CLAUDE_CONFIG_DIR:-$HOME/.claude}" -maxdepth 1 -type f -name 'CLAUDE-*.md' -print 2>/dev/null)
 
 # Check if CLAUDE.md references a companion file
-grep -o "CLAUDE-[^ )]*\.md" ~/.claude/CLAUDE.md 2>/dev/null
+grep -o "CLAUDE-[^ )]*\.md" "${CLAUDE_CONFIG_DIR:-$HOME/.claude}/CLAUDE.md" 2>/dev/null
 ```
 
 **Diagnosis**:
@@ -68,6 +71,8 @@ grep -o "CLAUDE-[^ )]*\.md" ~/.claude/CLAUDE.md 2>/dev/null
 - If `<!-- OMC:START -->` found in CLAUDE.md: OK
 - If `<!-- OMC:START -->` found in a companion file (e.g. `CLAUDE-omc.md`): OK - file-split pattern detected
 - If no OMC markers in CLAUDE.md or any companion file: WARN - outdated CLAUDE.md
+- If `OMC:VERSION` marker is missing from deterministic CLAUDE source scan (base + referenced companion): WARN - cannot verify CLAUDE.md freshness
+- If `CLAUDE.md OMC version` != `Latest cached plugin version`: WARN - version drift detected (run `omc update` or `omc setup`)
 
 ### Step 5: Check for Stale Plugin Cache
 
@@ -86,13 +91,13 @@ Check for legacy agents, commands, and skills installed via curl (before plugin
 
 ```bash
 # Check for legacy agents directory
-ls -la ~/.claude/agents/ 2>/dev/null
+ls -la "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/agents/ 2>/dev/null
 
 # Check for legacy commands directory
-ls -la ~/.claude/commands/ 2>/dev/null
+ls -la "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands/ 2>/dev/null
 
 # Check for legacy skills directory
-ls -la ~/.claude/skills/ 2>/dev/null
+ls -la "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/skills/ 2>/dev/null
 ```
 
 **Diagnosis**:
@@ -152,14 +157,14 @@ If issues found, ask user: "Would you like me to fix these issues automatically?
 If yes, apply fixes:
 
 ### Fix: Legacy Hooks in settings.json
-Remove the `"hooks"` section from `~/.claude/settings.json` (keep other settings intact)
+Remove the `"hooks"` section from `${CLAUDE_CONFIG_DIR:-~/.claude}/settings.json` (keep other settings intact)
 
 ### Fix: Legacy Bash Scripts
 ```bash
-rm -f ~/.claude/hooks/keyword-detector.sh
-rm -f ~/.claude/hooks/persistent-mode.sh
-rm -f ~/.claude/hooks/session-start.sh
-rm -f ~/.claude/hooks/stop-continuation.sh
+rm -f "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/hooks/keyword-detector.sh
+rm -f "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/hooks/persistent-mode.sh
+rm -f "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/hooks/session-start.sh
+rm -f "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/hooks/stop-continuation.sh
 ```
 
 ### Fix: Outdated Plugin
@@ -175,29 +180,9 @@ node -e "const p=require('path'),f=require('fs'),h=require('os').homedir(),d=pro
 ```
 
 ### Fix: Missing/Outdated CLAUDE.md
-Fetch latest from configured GitHub source and write to `~/.claude/CLAUDE.md`:
-```bash
-OMC_REPO="${OMC_REPO:-}"
-OMC_BRANCH="${OMC_BRANCH:-}"
-CONFIG_FILE="$HOME/.claude/.omc-config.json"
-
-if [ -z "$OMC_REPO" ] && [ -f "$CONFIG_FILE" ]; then
-  OMC_REPO=$(jq -r '.updateRepository // empty' "$CONFIG_FILE" 2>/dev/null)
-fi
-if [ -z "$OMC_BRANCH" ] && [ -f "$CONFIG_FILE" ]; then
-  OMC_BRANCH=$(jq -r '.updateBranch // empty' "$CONFIG_FILE" 2>/dev/null)
-fi
-if [ -z "$OMC_REPO" ] && command -v git >/dev/null 2>&1; then
-  ORIGIN_URL=$(git remote get-url origin 2>/dev/null || true)
-  if [ -n "$ORIGIN_URL" ]; then
-    OMC_REPO=$(echo "$ORIGIN_URL" | sed -E 's#^git@github.com:##; s#^https://github.com/##; s#\\.git$##')
-  fi
-fi
-
-OMC_REPO="${OMC_REPO:-Yeachan-Heo/oh-my-claudecode}"
-OMC_BRANCH="${OMC_BRANCH:-main}"
-curl -fsSL "https://raw.githubusercontent.com/${OMC_REPO}/${OMC_BRANCH}/docs/CLAUDE.md" -o "$HOME/.claude/CLAUDE.md"
-echo "Updated ~/.claude/CLAUDE.md from ${OMC_REPO}@${OMC_BRANCH}"
+Fetch latest from GitHub and write to `${CLAUDE_CONFIG_DIR:-~/.claude}/CLAUDE.md`:
+```
+WebFetch(url: "https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md", prompt: "Return the complete raw markdown content exactly as-is")
 ```
 
 ### Fix: Legacy Curl-Installed Content
@@ -206,14 +191,14 @@ Remove legacy agents, commands, and skills directories (now provided by plugin):
 
 ```bash
 # Backup first (optional - ask user)
-# mv ~/.claude/agents ~/.claude/agents.bak
-# mv ~/.claude/commands ~/.claude/commands.bak
-# mv ~/.claude/skills ~/.claude/skills.bak
+# mv "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/agents "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/agents.bak
+# mv "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands.bak
+# mv "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/skills "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/skills.bak
 
 # Or remove directly
-rm -rf ~/.claude/agents
-rm -rf ~/.claude/commands
-rm -rf ~/.claude/skills
+rm -rf "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/agents
+rm -rf "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/commands
+rm -rf "${CLAUDE_CONFIG_DIR:-$HOME/.claude}"/skills
 ```
 
 **Note**: Only remove if these contain oh-my-claudecode-related files. If user has custom agents/commands/skills, warn them and ask before removing.

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

@@ -62,6 +62,8 @@ MODES:
   Global Configuration (--global)
     - 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
@@ -77,7 +79,7 @@ EXAMPLES:
   /oh-my-claudecode:omc-setup --global  # Update all projects
   /oh-my-claudecode:omc-setup --force   # Re-run full setup wizard
 
-For more info: https://github.com/${OMC_REPO:-Yeachan-Heo/oh-my-claudecode}
+For more info: https://github.com/Yeachan-Heo/oh-my-claudecode
 ```
 
 ## Pre-Setup Check: Already Configured?
@@ -86,7 +88,7 @@ For more info: https://github.com/${OMC_REPO:-Yeachan-Heo/oh-my-claudecode}
 
 ```bash
 # Check if setup was already completed
-CONFIG_FILE="$HOME/.claude/.omc-config.json"
+CONFIG_FILE="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/.omc-config.json"
 
 if [ -f "$CONFIG_FILE" ]; then
   SETUP_COMPLETED=$(jq -r '.setupCompleted // empty' "$CONFIG_FILE" 2>/dev/null)

package/bundled/upstream/oh-my-claudecode/skills/omc-setup/phases/01-install-claude-md.md

@@ -15,15 +15,25 @@ Otherwise (initial setup wizard), use AskUserQuestion to prompt:
 
 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>
+bash "${CLAUDE_PLUGIN_ROOT}/scripts/setup-claude-md.sh" <CONFIG_TARGET> [GLOBAL_INSTALL_STYLE]
 ```
 
-Replace `<CONFIG_TARGET>` with `local` or `global`.
+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
@@ -40,7 +50,7 @@ https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.
 
 **Note**: The downloaded CLAUDE.md includes Context Persistence instructions with `<remember>` tags for surviving conversation compaction.
 
-**Note**: If an existing CLAUDE.md is found, it will be backed up before downloading the new version.
+**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
 
@@ -61,7 +71,8 @@ Note: This configuration is project-specific and won't affect other projects or
 If `CONFIG_TARGET` is `global`:
 ```
 OMC Global Configuration Complete
-- CLAUDE.md: Updated with latest configuration from GitHub at ~/.claude/CLAUDE.md
+- 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)

package/bundled/upstream/oh-my-claudecode/skills/omc-setup/phases/02-configure.md

@@ -50,7 +50,7 @@ console.log('Installed:',v||'(not found)');
 "
 
 # Check npm for latest version
-LATEST_VERSION=$(npm view claudecode-omc version 2>/dev/null)
+LATEST_VERSION=$(npm view oh-my-claude-sisyphus version 2>/dev/null)
 
 if [ -n "$INSTALLED_VERSION" ] && [ -n "$LATEST_VERSION" ]; then
   if [ "$INSTALLED_VERSION" != "$LATEST_VERSION" ]; then
@@ -80,7 +80,7 @@ Use the AskUserQuestion tool to prompt the user:
 Store the preference 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
@@ -119,17 +119,17 @@ If `OMC_CLI_INSTALLED` is `"false"`, use AskUserQuestion:
 **Question:** "Would you like to install the OMC CLI globally for standalone helper commands? (`omc`, `omc hud`, `omc teleport`)"
 
 **Options:**
-1. **Yes (Recommended)** - Install `claudecode-omc` via `npm install -g`
-2. **No - Skip** - Skip installation (can install manually later with `npm install -g claudecode-omc`)
+1. **Yes (Recommended)** - Install `oh-my-claude-sisyphus` via `npm install -g`
+2. **No - Skip** - Skip installation (can install manually later with `npm install -g oh-my-claude-sisyphus`)
 
 If user chooses **Yes**:
 
 ```bash
 if ! command -v npm &>/dev/null; then
   echo "WARNING: npm not found. Cannot install OMC CLI automatically."
-  echo "Install Node.js/npm first, then run: npm install -g claudecode-omc"
+  echo "Install Node.js/npm first, then run: npm install -g oh-my-claude-sisyphus"
 else
-  if npm install -g claudecode-omc 2>&1; then
+  if npm install -g oh-my-claude-sisyphus 2>&1; then
     echo "OMC CLI installed successfully."
     if command -v omc &>/dev/null; then
       OMC_CLI_VERSION=$(omc --version 2>/dev/null | head -1 || echo "installed")
@@ -139,8 +139,8 @@ else
     fi
   else
     echo "WARNING: Failed to install OMC CLI (permission issue or network error)."
-    echo "You can install manually later: npm install -g claudecode-omc"
-    echo "Or with sudo: sudo npm install -g claudecode-omc"
+    echo "You can install manually later: npm install -g oh-my-claude-sisyphus"
+    echo "Or with sudo: sudo npm install -g oh-my-claude-sisyphus"
   fi
 fi
 ```
@@ -189,7 +189,7 @@ If beads or beads-rust is detected, use AskUserQuestion:
 Store the preference:
 
 ```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