oh-my-claude-sisyphus 3.7.0 → 3.7.3

package/hooks/keyword-detector.sh

@@ -48,8 +48,8 @@ PROMPT_LOWER=$(echo "$PROMPT_NO_CODE" | tr '[:upper:]' '[:lower:]')
 # Check for ultrawork keywords (highest priority)
 if echo "$PROMPT_LOWER" | grep -qE '\b(ultrawork|ulw|uw)\b'; then
   # Create persistent ultrawork state
-  mkdir -p "$DIRECTORY/.sisyphus" 2>/dev/null
-  mkdir -p "$HOME/.claude" 2>/dev/null
+  mkdir -p "$DIRECTORY/.omc/state" 2>/dev/null
+  mkdir -p "$HOME/.omc/state" 2>/dev/null
 
   # Escape prompt for JSON
   PROMPT_ESCAPED=$(echo "$PROMPT" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g' | tr '\n' ' ')
@@ -63,8 +63,8 @@ if echo "$PROMPT_LOWER" | grep -qE '\b(ultrawork|ulw|uw)\b'; then
 }"
 
   # Write state to both local and global locations
-  echo "$STATE_JSON" > "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null
-  echo "$STATE_JSON" > "$HOME/.claude/ultrawork-state.json" 2>/dev/null
+  echo "$STATE_JSON" > "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null
+  echo "$STATE_JSON" > "$HOME/.omc/state/ultrawork-state.json" 2>/dev/null
 
   # Return ultrawork mode injection
   cat << 'EOF'

package/hooks/persistent-mode.sh

@@ -21,22 +21,22 @@ fi
 
 # Check for active ultrawork state
 ULTRAWORK_STATE=""
-if [ -f "$DIRECTORY/.omc/ultrawork-state.json" ]; then
-  ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null)
-elif [ -f "$HOME/.claude/ultrawork-state.json" ]; then
-  ULTRAWORK_STATE=$(cat "$HOME/.claude/ultrawork-state.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ultrawork-state.json" ]; then
+  ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null)
+elif [ -f "$HOME/.omc/state/ultrawork-state.json" ]; then
+  ULTRAWORK_STATE=$(cat "$HOME/.omc/state/ultrawork-state.json" 2>/dev/null)
 fi
 
 # Check for active ralph loop
 RALPH_STATE=""
-if [ -f "$DIRECTORY/.omc/ralph-state.json" ]; then
-  RALPH_STATE=$(cat "$DIRECTORY/.omc/ralph-state.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ralph-state.json" ]; then
+  RALPH_STATE=$(cat "$DIRECTORY/.omc/state/ralph-state.json" 2>/dev/null)
 fi
 
 # Check for verification state (oracle verification)
 VERIFICATION_STATE=""
-if [ -f "$DIRECTORY/.omc/ralph-verification.json" ]; then
-  VERIFICATION_STATE=$(cat "$DIRECTORY/.omc/ralph-verification.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ralph-verification.json" ]; then
+  VERIFICATION_STATE=$(cat "$DIRECTORY/.omc/state/ralph-verification.json" 2>/dev/null)
 fi
 
 # Check for incomplete todos
@@ -106,7 +106,7 @@ EOF
     if [ "$ITERATION" -lt "$MAX_ITER" ]; then
       # Increment iteration
       NEW_ITER=$((ITERATION + 1))
-      echo "$RALPH_STATE" | jq ".iteration = $NEW_ITER" > "$DIRECTORY/.omc/ralph-state.json" 2>/dev/null
+      echo "$RALPH_STATE" | jq ".iteration = $NEW_ITER" > "$DIRECTORY/.omc/state/ralph-state.json" 2>/dev/null
 
       cat << EOF
 {"continue": false, "reason": "<ralph-loop-continuation>\n\n[RALPH LOOP - ITERATION $NEW_ITER/$MAX_ITER]\n\nYour previous attempt did not output the completion promise. The work is NOT done yet.\n\nCRITICAL INSTRUCTIONS:\n1. Review your progress and the original task\n2. Check your todo list - are ALL items marked complete?\n3. Continue from where you left off\n4. When FULLY complete, output: <promise>$PROMISE</promise>\n5. Do NOT stop until the task is truly done\n\nOriginal task: $PROMPT\n\n</ralph-loop-continuation>\n\n---\n"}
@@ -149,7 +149,7 @@ if [ -n "$ULTRAWORK_STATE" ] && [ "$INCOMPLETE_COUNT" -gt 0 ]; then
 
     # Update state file (best effort)
     if command -v jq &> /dev/null; then
-      echo "$ULTRAWORK_STATE" | jq ".reinforcement_count = $NEW_COUNT | .last_checked_at = \"$(date -Iseconds)\"" > "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null
+      echo "$ULTRAWORK_STATE" | jq ".reinforcement_count = $NEW_COUNT | .last_checked_at = \"$(date -Iseconds)\"" > "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null
     fi
 
     cat << EOF

package/hooks/session-start.sh

@@ -18,11 +18,11 @@ fi
 MESSAGES=""
 
 # Check for active ultrawork state
-if [ -f "$DIRECTORY/.omc/ultrawork-state.json" ] || [ -f "$HOME/.claude/ultrawork-state.json" ]; then
-  if [ -f "$DIRECTORY/.omc/ultrawork-state.json" ]; then
-    ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ultrawork-state.json" ] || [ -f "$HOME/.omc/state/ultrawork-state.json" ]; then
+  if [ -f "$DIRECTORY/.omc/state/ultrawork-state.json" ]; then
+    ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null)
   else
-    ULTRAWORK_STATE=$(cat "$HOME/.claude/ultrawork-state.json" 2>/dev/null)
+    ULTRAWORK_STATE=$(cat "$HOME/.omc/state/ultrawork-state.json" 2>/dev/null)
   fi
 
   IS_ACTIVE=$(echo "$ULTRAWORK_STATE" | jq -r '.active // false' 2>/dev/null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-claude-sisyphus",
-  "version": "3.7.0",
+  "version": "3.7.3",
   "description": "Multi-agent orchestration system for Claude Code - Inspired by oh-my-opencode",
   "type": "module",
   "main": "dist/index.js",
@@ -53,10 +53,12 @@
     "@ast-grep/napi": "^0.31.0",
     "@tokscale/core": "^1.0.25",
     "@types/better-sqlite3": "^7.6.13",
+    "ajv": "^8.17.1",
     "better-sqlite3": "^12.6.2",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "jsonc-parser": "^3.3.1",
+    "safe-regex": "^2.1.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "zod": "^3.23.8"
   },

package/scripts/keyword-detector.mjs

@@ -137,15 +137,15 @@ function activateUltraworkState(directory, prompt) {
     last_checked_at: new Date().toISOString()
   };
 
-  // Write to local .sisyphus directory
-  const localDir = join(directory, '.omc');
+  // Write to local .omc/state directory
+  const localDir = join(directory, '.omc', 'state');
   if (!existsSync(localDir)) {
     try { mkdirSync(localDir, { recursive: true }); } catch {}
   }
   try { writeFileSync(join(localDir, 'ultrawork-state.json'), JSON.stringify(state, null, 2)); } catch {}
 
-  // Write to global .claude directory
-  const globalDir = join(homedir(), '.claude');
+  // Write to global .omc/state directory
+  const globalDir = join(homedir(), '.omc', 'state');
   if (!existsSync(globalDir)) {
     try { mkdirSync(globalDir, { recursive: true }); } catch {}
   }

package/scripts/persistent-mode.mjs

@@ -166,14 +166,14 @@ async function main() {
     const todosDir = join(homedir(), '.claude', 'todos');
 
     // Check for ultrawork state
-    let ultraworkState = readJsonFile(join(directory, '.omc', 'ultrawork-state.json'))
-      || readJsonFile(join(homedir(), '.claude', 'ultrawork-state.json'));
+    let ultraworkState = readJsonFile(join(directory, '.omc', 'state', 'ultrawork-state.json'))
+      || readJsonFile(join(homedir(), '.omc', 'state', 'ultrawork-state.json'));
 
     // Check for ralph loop state
-    const ralphState = readJsonFile(join(directory, '.omc', 'ralph-state.json'));
+    const ralphState = readJsonFile(join(directory, '.omc', 'state', 'ralph-state.json'));
 
     // Check for verification state
-    const verificationState = readJsonFile(join(directory, '.omc', 'ralph-verification.json'));
+    const verificationState = readJsonFile(join(directory, '.omc', 'state', 'ralph-verification.json'));
 
     // Count incomplete todos
     const incompleteCount = countIncompleteTodos(todosDir, directory);
@@ -256,7 +256,7 @@ ${verificationState.oracle_feedback}
       if (iteration < maxIter) {
         const newIter = iteration + 1;
         ralphState.iteration = newIter;
-        writeJsonFile(join(directory, '.omc', 'ralph-state.json'), ralphState);
+        writeJsonFile(join(directory, '.omc', 'state', 'ralph-state.json'), ralphState);
 
         // Build continuation message with PRD context if available
         let prdContext = '';
@@ -349,7 +349,7 @@ ${ralphState.prompt ? `Original task: ${ralphState.prompt}` : ''}
       ultraworkState.reinforcement_count = newCount;
       ultraworkState.last_checked_at = new Date().toISOString();
 
-      writeJsonFile(join(directory, '.omc', 'ultrawork-state.json'), ultraworkState);
+      writeJsonFile(join(directory, '.omc', 'state', 'ultrawork-state.json'), ultraworkState);
 
       console.log(JSON.stringify({
         continue: false,

package/scripts/persistent-mode.sh

@@ -21,22 +21,22 @@ fi
 
 # Check for active ultrawork state
 ULTRAWORK_STATE=""
-if [ -f "$DIRECTORY/.omc/ultrawork-state.json" ]; then
-  ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null)
-elif [ -f "$HOME/.claude/ultrawork-state.json" ]; then
-  ULTRAWORK_STATE=$(cat "$HOME/.claude/ultrawork-state.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ultrawork-state.json" ]; then
+  ULTRAWORK_STATE=$(cat "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null)
+elif [ -f "$HOME/.omc/state/ultrawork-state.json" ]; then
+  ULTRAWORK_STATE=$(cat "$HOME/.omc/state/ultrawork-state.json" 2>/dev/null)
 fi
 
 # Check for active ralph loop
 RALPH_STATE=""
-if [ -f "$DIRECTORY/.omc/ralph-state.json" ]; then
-  RALPH_STATE=$(cat "$DIRECTORY/.omc/ralph-state.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ralph-state.json" ]; then
+  RALPH_STATE=$(cat "$DIRECTORY/.omc/state/ralph-state.json" 2>/dev/null)
 fi
 
 # Check for verification state (oracle verification)
 VERIFICATION_STATE=""
-if [ -f "$DIRECTORY/.omc/ralph-verification.json" ]; then
-  VERIFICATION_STATE=$(cat "$DIRECTORY/.omc/ralph-verification.json" 2>/dev/null)
+if [ -f "$DIRECTORY/.omc/state/ralph-verification.json" ]; then
+  VERIFICATION_STATE=$(cat "$DIRECTORY/.omc/state/ralph-verification.json" 2>/dev/null)
 fi
 
 # Check for incomplete todos
@@ -106,7 +106,7 @@ EOF
     if [ "$ITERATION" -lt "$MAX_ITER" ]; then
       # Increment iteration
       NEW_ITER=$((ITERATION + 1))
-      echo "$RALPH_STATE" | jq ".iteration = $NEW_ITER" > "$DIRECTORY/.omc/ralph-state.json" 2>/dev/null
+      echo "$RALPH_STATE" | jq ".iteration = $NEW_ITER" > "$DIRECTORY/.omc/state/ralph-state.json" 2>/dev/null
 
       # Check if ultrawork is linked (auto-activated with ralph)
       LINKED_ULTRAWORK=$(echo "$RALPH_STATE" | jq -r '.linked_ultrawork // false' 2>/dev/null)
@@ -288,7 +288,7 @@ if [ -n "$ULTRAWORK_STATE" ] && [ "$INCOMPLETE_COUNT" -gt 0 ]; then
 
     # Update state file (best effort)
     if command -v jq &> /dev/null; then
-      echo "$ULTRAWORK_STATE" | jq ".reinforcement_count = $NEW_COUNT | .last_checked_at = \"$(date -Iseconds)\"" > "$DIRECTORY/.omc/ultrawork-state.json" 2>/dev/null
+      echo "$ULTRAWORK_STATE" | jq ".reinforcement_count = $NEW_COUNT | .last_checked_at = \"$(date -Iseconds)\"" > "$DIRECTORY/.omc/state/ultrawork-state.json" 2>/dev/null
     fi
 
     cat << EOF

package/scripts/session-start.mjs

@@ -48,7 +48,7 @@ function countIncompleteTodos(todosDir) {
 
 // Check if HUD is properly installed
 function checkHudInstallation() {
-  const hudScript = join(homedir(), '.claude', 'hud', 'sisyphus-hud.mjs');
+  const hudScript = join(homedir(), '.claude', 'hud', 'omc-hud.mjs');
   const settingsFile = join(homedir(), '.claude', 'settings.json');
 
   // Check if HUD script exists
@@ -92,8 +92,8 @@ async function main() {
     }
 
     // Check for ultrawork state
-    const ultraworkState = readJsonFile(join(directory, '.omc', 'ultrawork-state.json'))
-      || readJsonFile(join(homedir(), '.claude', 'ultrawork-state.json'));
+    const ultraworkState = readJsonFile(join(directory, '.omc', 'state', 'ultrawork-state.json'))
+      || readJsonFile(join(homedir(), '.omc', 'state', 'ultrawork-state.json'));
 
     if (ultraworkState?.active) {
       messages.push(`<session-restore>
@@ -112,7 +112,7 @@ Continue working in ultrawork mode until all tasks are complete.
     }
 
     // Check for ralph loop state
-    const ralphState = readJsonFile(join(directory, '.omc', 'ralph-state.json'));
+    const ralphState = readJsonFile(join(directory, '.omc', 'state', 'ralph-state.json'));
     if (ralphState?.active) {
       messages.push(`<session-restore>
 

package/skills/hud/SKILL.md

@@ -81,6 +81,19 @@ Then, use the Write tool to create `~/.claude/hud/omc-hud.mjs` with this exact c
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { pathToFileURL } from "node:url";
+
+// Semantic version comparison: returns negative if a < b, positive if a > b, 0 if equal
+function semverCompare(a, b) {
+  const pa = a.replace(/^v/, "").split(".").map(Number);
+  const pb = b.replace(/^v/, "").split(".").map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const na = pa[i] || 0;
+    const nb = pb[i] || 0;
+    if (na !== nb) return na - nb;
+  }
+  return 0;
+}
 
 async function main() {
   const home = homedir();
@@ -92,11 +105,11 @@ async function main() {
     try {
       const versions = readdirSync(pluginCacheBase);
       if (versions.length > 0) {
-        const latestVersion = versions.sort().reverse()[0];
+        const latestVersion = versions.sort(semverCompare).reverse()[0];
         pluginCacheDir = join(pluginCacheBase, latestVersion);
         const pluginPath = join(pluginCacheDir, "dist/hud/index.js");
         if (existsSync(pluginPath)) {
-          await import(pluginPath);
+          await import(pathToFileURL(pluginPath).href);
           return;
         }
       }
@@ -114,7 +127,7 @@ async function main() {
   for (const devPath of devPaths) {
     if (existsSync(devPath)) {
       try {
-        await import(devPath);
+        await import(pathToFileURL(devPath).href);
         return;
       } catch { /* continue */ }
     }
@@ -138,12 +151,31 @@ chmod +x ~/.claude/hud/omc-hud.mjs
 
 **Step 4:** Update settings.json to use the HUD:
 
-Read `~/.claude/settings.json`, then update/add the `statusLine` field:
+Read `~/.claude/settings.json`, then update/add the `statusLine` field.
+
+**IMPORTANT:** The command must use an absolute path, not `~`, because Windows does not expand `~` in shell commands.
+
+First, determine the correct path:
+```bash
+node -e "const p=require('path').join(require('os').homedir(),'.claude','hud','omc-hud.mjs');console.log(JSON.stringify(p))"
+```
+
+Then set the `statusLine` field using the resolved path. On Unix it will look like:
+```json
+{
+  "statusLine": {
+    "type": "command",
+    "command": "node /home/username/.claude/hud/omc-hud.mjs"
+  }
+}
+```
+
+On Windows it will look like:
 ```json
 {
   "statusLine": {
     "type": "command",
-    "command": "node ~/.claude/hud/omc-hud.mjs"
+    "command": "node C:\\Users\\username\\.claude\\hud\\omc-hud.mjs"
   }
 }
 ```

package/skills/omc-setup/SKILL.md

@@ -7,6 +7,104 @@ description: Setup and configure oh-my-claudecode (the ONLY command you need to
 
 This is the **only command you need to learn**. After running this, everything else is automatic.
 
+## Graceful Interrupt Handling
+
+**IMPORTANT**: This setup process saves progress after each step. If interrupted (Ctrl+C or connection loss), the setup can resume from where it left off.
+
+### State File Location
+- `.omc/state/setup-state.json` - Tracks completed steps
+
+### Resume Detection (Step 0)
+
+Before starting any step, check for existing state:
+
+```bash
+# Check for existing setup state
+STATE_FILE=".omc/state/setup-state.json"
+
+# Cross-platform ISO date to epoch conversion
+iso_to_epoch() {
+  local iso_date="$1"
+  local epoch=""
+  # Try GNU date first (Linux)
+  epoch=$(date -d "$iso_date" +%s 2>/dev/null)
+  if [ $? -eq 0 ] && [ -n "$epoch" ]; then
+    echo "$epoch"
+    return 0
+  fi
+  # Try BSD/macOS date
+  local clean_date=$(echo "$iso_date" | sed 's/[+-][0-9][0-9]:[0-9][0-9]$//' | sed 's/Z$//' | sed 's/T/ /')
+  epoch=$(date -j -f "%Y-%m-%d %H:%M:%S" "$clean_date" +%s 2>/dev/null)
+  if [ $? -eq 0 ] && [ -n "$epoch" ]; then
+    echo "$epoch"
+    return 0
+  fi
+  echo "0"
+}
+
+if [ -f "$STATE_FILE" ]; then
+  # Check if state is stale (older than 24 hours)
+  TIMESTAMP_RAW=$(jq -r '.timestamp // empty' "$STATE_FILE" 2>/dev/null)
+  if [ -n "$TIMESTAMP_RAW" ]; then
+    TIMESTAMP_EPOCH=$(iso_to_epoch "$TIMESTAMP_RAW")
+    NOW_EPOCH=$(date +%s)
+    STATE_AGE=$((NOW_EPOCH - TIMESTAMP_EPOCH))
+  else
+    STATE_AGE=999999  # Force fresh start if no timestamp
+  fi
+  if [ "$STATE_AGE" -gt 86400 ]; then
+    echo "Previous setup state is more than 24 hours old. Starting fresh."
+    rm -f "$STATE_FILE"
+  else
+    LAST_STEP=$(jq -r ".lastCompletedStep // 0" "$STATE_FILE" 2>/dev/null || echo "0")
+    TIMESTAMP=$(jq -r .timestamp "$STATE_FILE" 2>/dev/null || echo "unknown")
+    echo "Found previous setup session (Step $LAST_STEP completed at $TIMESTAMP)"
+  fi
+fi
+```
+
+If state exists, use AskUserQuestion to prompt:
+
+**Question:** "Found a previous setup session. Would you like to resume or start fresh?"
+
+**Options:**
+1. **Resume from step $LAST_STEP** - Continue where you left off
+2. **Start fresh** - Begin from the beginning (clears saved state)
+
+If user chooses "Start fresh":
+```bash
+rm -f ".omc/state/setup-state.json"
+echo "Previous state cleared. Starting fresh setup."
+```
+
+### Save Progress Helper
+
+After completing each major step, save progress:
+
+```bash
+# Save setup progress (call after each step)
+# Usage: save_setup_progress STEP_NUMBER
+save_setup_progress() {
+  mkdir -p .omc/state
+  cat > ".omc/state/setup-state.json" << EOF
+{
+  "lastCompletedStep": $1,
+  "timestamp": "$(date -Iseconds)",
+  "configType": "${CONFIG_TYPE:-unknown}"
+}
+EOF
+}
+```
+
+### Clear State on Completion
+
+After successful setup completion (Step 7/8), remove the state file:
+
+```bash
+rm -f ".omc/state/setup-state.json"
+echo "Setup completed successfully. State cleared."
+```
+
 ## Usage Modes
 
 This skill handles three scenarios:
@@ -24,6 +122,8 @@ Check for flags in the user's invocation:
 
 ## Step 1: Initial Setup Wizard (Default Behavior)
 
+**Note**: If resuming and lastCompletedStep >= 1, skip to the appropriate step based on configType.
+
 Use the AskUserQuestion tool to prompt the user:
 
 **Question:** "Where should I configure oh-my-claudecode?"
@@ -90,7 +190,19 @@ grep -q "oh-my-claudecode" ~/.claude/settings.json && echo "Plugin verified" ||
 
 ### Confirm Local Configuration Success
 
-After completing local configuration, report:
+After completing local configuration, save progress and report:
+
+```bash
+# Save progress - Step 2 complete (Local config)
+mkdir -p .omc/state
+cat > ".omc/state/setup-state.json" << EOF
+{
+  "lastCompletedStep": 2,
+  "timestamp": "$(date -Iseconds)",
+  "configType": "local"
+}
+EOF
+```
 
 **OMC Project Configuration Complete**
 - CLAUDE.md: Updated with latest configuration from GitHub at ./.claude/CLAUDE.md
@@ -102,7 +214,11 @@ After completing local configuration, report:
 
 **Note**: This configuration is project-specific and won't affect other projects or global settings.
 
-If `--local` flag was used, **STOP HERE**. Do not continue to HUD setup or other steps.
+If `--local` flag was used, clear state and **STOP HERE**:
+```bash
+rm -f ".omc/state/setup-state.json"
+```
+Do not continue to HUD setup or other steps.
 
 ## Step 2B: Global Configuration (--global flag or user chose GLOBAL)
 
@@ -164,7 +280,19 @@ grep -q "oh-my-claudecode" ~/.claude/settings.json && echo "Plugin verified" ||
 
 ### Confirm Global Configuration Success
 
-After completing global configuration, report:
+After completing global configuration, save progress and report:
+
+```bash
+# Save progress - Step 2 complete (Global config)
+mkdir -p .omc/state
+cat > ".omc/state/setup-state.json" << EOF
+{
+  "lastCompletedStep": 2,
+  "timestamp": "$(date -Iseconds)",
+  "configType": "global"
+}
+EOF
+```
 
 **OMC Global Configuration Complete**
 - CLAUDE.md: Updated with latest configuration from GitHub at ~/.claude/CLAUDE.md
@@ -176,10 +304,16 @@ After completing global configuration, report:
 
 **Note**: Hooks are now managed by the plugin system automatically. No manual hook installation required.
 
-If `--global` flag was used, **STOP HERE**. Do not continue to HUD setup or other steps.
+If `--global` flag was used, clear state and **STOP HERE**:
+```bash
+rm -f ".omc/state/setup-state.json"
+```
+Do not continue to HUD setup or other steps.
 
 ## Step 3: Setup HUD Statusline
 
+**Note**: If resuming and lastCompletedStep >= 3, skip to Step 3.5.
+
 The HUD shows real-time status in Claude Code's status bar. **Invoke the hud skill** to set up and configure:
 
 Use the Skill tool to invoke: `hud` with args: `setup`
@@ -189,6 +323,20 @@ This will:
 2. Configure `statusLine` in `~/.claude/settings.json`
 3. Report status and prompt to restart if needed
 
+After HUD setup completes, save progress:
+```bash
+# Save progress - Step 3 complete (HUD setup)
+mkdir -p .omc/state
+CONFIG_TYPE=$(cat ".omc/state/setup-state.json" 2>/dev/null | grep -oE '"configType":\s*"[^"]+"' | cut -d'"' -f4 || echo "unknown")
+cat > ".omc/state/setup-state.json" << EOF
+{
+  "lastCompletedStep": 3,
+  "timestamp": "$(date -Iseconds)",
+  "configType": "$CONFIG_TYPE"
+}
+EOF
+```
+
 ## Step 3.5: Clear Stale Plugin Cache
 
 Clear old cached plugin versions to avoid conflicts:
@@ -471,6 +619,16 @@ echo "  https://github.com/Yeachan-Heo/oh-my-claudecode"
 echo ""
 ```
 
+### Clear Setup State on Completion
+
+After Step 8 completes (regardless of star choice), clear the setup state:
+
+```bash
+# Setup complete - clear state file
+rm -f ".omc/state/setup-state.json"
+echo "Setup completed successfully!"
+```
+
 ## Keeping Up to Date
 
 After installing oh-my-claudecode updates (via npm or plugin update), run: