oh-my-harness 0.10.2 → 0.12.0

package/README.md

@@ -53,10 +53,10 @@ npx oh-my-harness init "TypeScript Next.js frontend with Python FastAPI backend"
 
 # Or install globally
 npm install -g oh-my-harness
-oh-my-harness init --preset nextjs fastapi
+oh-my-harness init "React app with TDD"
 
 # Short alias works too
-omh init "React app with TDD"
+omh init "Android Kotlin app with Hilt, JUnit, Gradle"
 omh catalog list
 omh test          # Dry-run verify your harness
 omh stats         # TUI analytics dashboard
@@ -69,22 +69,28 @@ omh stats         # TUI analytics dashboard
 └── config.json                        # AI provider config (global, not per-project)
 
 your-project/
-├── CLAUDE.md                          # TDD rules, coding standards
+├── CLAUDE.md                          # Claude Code instructions (TDD rules, standards)
+├── AGENTS.md                          # Codex CLI instructions (same managed sections)
 ├── harness.yaml                       # Your harness config (source of truth)
-└── .claude/
-    ├── settings.json                  # Hook configs, permissions
-    ├── hooks/
-    │   ├── catalog-branch-guard.sh    # Blocks commits on merged branches
-    │   ├── catalog-tdd-guard.sh       # Enforces test-first workflow
-    │   ├── catalog-commit-test-gate.sh # Tests must pass before commit
-    │   ├── catalog-path-guard.sh      # Protects build outputs
-    │   ├── catalog-command-guard.sh   # Blocks dangerous commands
-    │   ├── catalog-lint-on-save.sh    # Auto-lint on save
-    │   ├── catalog-auto-pr.sh         # Auto-create PR after push
-    │   └── .state/
-    │       ├── events.jsonl           # Hook event log (for analytics)
-    │       └── edit-history.json      # TDD guard state
-    └── oh-my-harness.json             # Active preset tracking
+├── .omh/                              # Single source of truth — hooks + state
+│   ├── hooks/
+│   │   ├── catalog-branch-guard.sh    # Blocks commits on merged branches
+│   │   ├── catalog-tdd-guard.sh       # Enforces test-first workflow
+│   │   ├── catalog-commit-test-gate.sh # Tests must pass before commit
+│   │   ├── catalog-path-guard.sh      # Protects build outputs
+│   │   ├── catalog-command-guard.sh   # Blocks dangerous commands
+│   │   ├── catalog-lint-on-save.sh    # Auto-lint on save
+│   │   └── catalog-auto-pr.sh         # Auto-create PR after push
+│   ├── state/                         # gitignored — log/runtime data
+│   │   ├── events.jsonl               # Unified hook event log (powers omh stats)
+│   │   └── tdd-edits.json             # TDD guard working state
+│   └── manifest.json                  # Generated-files manifest
+├── .claude/
+│   ├── settings.json                  # Claude permissions + hooks → .omh/hooks/*.sh
+│   └── oh-my-harness.json             # Harness init/sync state
+└── .codex/
+    ├── config.toml                    # [features] codex_hooks = true, goals = true
+    └── hooks.json                     # Codex hooks → .omh/hooks/*.sh (same scripts)
 ```
 
 ---
@@ -95,7 +101,7 @@ your-project/
   ~/.omh/config.json   ┌─────────────────────┐
   ┌────────────────┐   │                     │
   │ • Claude CLI   │──▶│   NL Processing     │◀── "React + FastAPI
-  │ • Claude API   │   │   or --preset flag  │     TDD enforced"
+  │ • Claude API   │   │   (describe your    │     TDD enforced"
   │ • OpenAI API   │   │                     │
   │ • Gemini API   │   └────────┬────────────┘
   └────────────────┘            │
@@ -176,7 +182,7 @@ All enforcement is powered by **catalog blocks** — reusable, parameterized hoo
 | 🎨 `format-on-save` | auto-fix | Auto-format on file save |
 | 🧪 `test-on-save` | auto-fix | Auto-run tests on file save |
 | 🔀 `auto-pr` | automation | Auto-create PR after push |
-| 🧪 `tdd-guard` | quality | Blocks source edits unless test modified first (JS/TS/Python) |
+| 🧪 `tdd-guard` | quality | Blocks source edits unless test modified first (JS/TS/Python/Kotlin/Java) |
 | 🔒 `sql-guard` | security | Blocks dangerous SQL operations |
 | 🌳 `worktree-setup` | monorepo | Supports monorepo worktree patterns |
 | 🗜️ `compact-context` | maintenance | Re-injects context on session start |
@@ -218,7 +224,7 @@ hooks:
 ```bash
 # 🚀 Initialize
 omh init "your project description"      # NL-powered (requires AI provider)
-omh init --preset nextjs fastapi          # Preset-based (instant)
+omh init                                  # Interactive TUI (import existing harness.yaml)
 
 # 📋 Catalog
 omh catalog list                          # Browse all building blocks
@@ -229,9 +235,7 @@ omh hook add branch-guard                 # Add a hook
 omh hook remove auto-pr                   # Remove a hook
 
 # 🔄 Sync & manage
-omh sync                                 # Regenerate from harness.yaml
-omh add nextjs                            # Add a preset
-omh remove fastapi                        # Remove a preset
+omh sync                                 # Regenerate all files from harness.yaml
 
 # 🩺 Verify & monitor
 omh doctor                               # Health check
@@ -307,7 +311,7 @@ Keyboard: `1/2/3` views, `↑/↓` scroll, `d` date filter, `r` reload, `q` quit
 
 ## 📊 Stateful Hook Logging
 
-Every hook invocation is recorded in `.claude/hooks/.state/events.jsonl`:
+Every hook invocation is recorded in `.omh/state/events.jsonl`:
 
 ```jsonl
 {"ts":"2026-03-18T08:00:00Z","event":"PreToolUse","hook":"catalog-tdd-guard.sh","decision":"block","reason":"TDD — foo.test.* 테스트 파일을 먼저 수정하세요"}
@@ -331,7 +335,7 @@ oh-my-harness/
 │   │   ├── template-engine.ts # Handlebars rendering + applyDefaults
 │   │   └── converter.ts    # HookEntry[] → rendered scripts
 │   ├── cli/
-│   │   ├── commands/       # init, add, remove, doctor, catalog, hook, sync, test
+│   │   ├── commands/       # init, doctor, catalog, hook, sync, test
 │   │   ├── stats/          # TUI dashboard (ink/React)
 │   │   │   ├── App.tsx     # App shell (tab bar, keyboard nav)
 │   │   │   ├── data.ts     # Data aggregation layer
@@ -343,10 +347,10 @@ oh-my-harness/
 │   │   ├── provider-setup.ts  # Provider configuration UI
 │   │   └── tool-checker.ts    # Command executable checks
 │   ├── core/
-│   │   ├── harness-schema.ts   # harness.yaml Zod schema
-│   │   ├── harness-converter.ts # enforcement→hooks + MergedConfig
-│   │   ├── generator.ts        # Orchestrates all generators
-│   │   └── config-merger.ts    # Multi-preset merge
+│   │   ├── harness-schema.ts      # harness.yaml Zod schema
+│   │   ├── merged-config.ts       # MergedConfig + HooksConfig interfaces
+│   │   ├── harness-converter-v2.ts # harness.yaml → MergedConfig (catalog pipeline)
+│   │   └── generator.ts           # Orchestrates all generators
 │   ├── generators/
 │   │   ├── claude-md.ts    # CLAUDE.md with idempotent markers
 │   │   ├── hooks.ts        # Hook scripts + event logger injection
@@ -369,8 +373,7 @@ oh-my-harness/
 │       │   └── gemini-api.ts
 │       ├── parse-intent.ts      # LLM prompt integration
 │       └── prompt-templates.ts  # NL prompt construction
-├── presets/                # Built-in preset definitions
-└── tests/                  # 873+ tests (unit + integration)
+└── tests/                  # 900+ tests (unit + integration)
 ```
 
 ---
@@ -396,10 +399,12 @@ oh-my-harness/
 - [x] Multi-provider AI support — Claude API, OpenAI, Gemini
 - [x] Interactive model selection per provider
 - [x] GitHub star prompt — first-time only
+- [x] Codex emitter — `AGENTS.md` + `.codex/hooks.json` + `.codex/config.toml`
+- [x] Unified `.omh/` layout — single source of truth for hooks & state across runtimes
 - [ ] Cursor (`.cursor/rules/`) emitter
-- [ ] Codex (`AGENTS.md`) emitter
-- [ ] GitHub Copilot emitter
-- [ ] Community preset registry
+- [ ] PI (Process Isolation) emitter — sandboxed tool execution
+- [ ] `ask` mode — request approval before executing risky tools
+- [ ] Community harness.yaml registry — share and reuse configs
 - [ ] `omh modify "change X"` — NL config editing
 
 ---

package/dist/bin/oh-my-harness.js

@@ -1,4 +1,9 @@
 #!/usr/bin/env node
+import { createRequire } from "node:module";
 import { createCli } from "../cli/index.js";
+import { notifyIfUpdateAvailable } from "../cli/version-notifier.js";
+const require = createRequire(import.meta.url);
+const pkg = require("../../package.json");
+notifyIfUpdateAvailable({ name: pkg.name, version: pkg.version });
 const cli = createCli();
 cli.parse(process.argv);

package/dist/catalog/blocks/branch-guard.js

@@ -19,8 +19,9 @@ if echo "$COMMAND" | grep -qE "git commit|git push"; then
   [[ -z "$BRANCH" ]] && exit 0
   MAIN='{{mainBranch}}'
   if [[ "$BRANCH" == "$MAIN" ]] || [[ "$BRANCH" == "master" && "$MAIN" == "main" ]]; then
-    _log_event "block" "oh-my-harness: direct commits to $BRANCH are blocked. Create a feature branch."
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: direct commits to $BRANCH are blocked. Create a feature branch.\\"}"
+    REASON="oh-my-harness: direct commits to $BRANCH are blocked. Create a feature branch."
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
   MERGED=0
@@ -37,8 +38,9 @@ if echo "$COMMAND" | grep -qE "git commit|git push"; then
     fi
   fi
   if [[ "$MERGED" -eq 1 ]]; then
-    _log_event "block" "oh-my-harness: branch $BRANCH has already been merged to $MAIN. Create a new branch."
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: branch $BRANCH has already been merged to $MAIN. Create a new branch.\\"}"
+    REASON="oh-my-harness: branch $BRANCH has already been merged to $MAIN. Create a new branch."
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
 fi

package/dist/catalog/blocks/command-guard.js

@@ -25,8 +25,9 @@ NORMALIZED_CMD=$(printf '%s' "$COMMAND" | tr '[:space:]' ' ' | tr -s ' ')
 PATTERNS=({{#each patterns}}"{{{this}}}" {{/each}})
 for PATTERN in "\${PATTERNS[@]}"; do
   if echo "$NORMALIZED_CMD" | grep -qF -- "$PATTERN"; then
-    _log_event "block" "oh-my-harness: command matches blocked pattern: $PATTERN"
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: command matches blocked pattern: $PATTERN\\"}"
+    REASON="oh-my-harness: command matches blocked pattern: $PATTERN"
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
 done

package/dist/catalog/blocks/commit-test-gate.js

@@ -17,8 +17,9 @@ COMMAND=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
 if echo "$COMMAND" | grep -qE "git commit"; then
   echo "oh-my-harness: Running {{{testCommand}}} before commit..." >&2
   if ! {{{testCommand}}} >&2 2>&1; then
-    _log_event "block" "oh-my-harness: pre-commit check failed"
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: pre-commit check failed\\"}"
+    REASON="oh-my-harness: pre-commit check failed"
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
 fi

package/dist/catalog/blocks/commit-typecheck-gate.js

@@ -17,8 +17,9 @@ COMMAND=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
 if echo "$COMMAND" | grep -qE "git commit"; then
   echo "oh-my-harness: Running {{{typecheckCommand}}} before commit..." >&2
   if ! {{{typecheckCommand}}} >&2 2>&1; then
-    _log_event "block" "oh-my-harness: pre-commit check failed"
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: pre-commit check failed\\"}"
+    REASON="oh-my-harness: pre-commit check failed"
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
 fi

package/dist/catalog/blocks/config-audit.js

@@ -1,29 +1,20 @@
 export const configAudit = {
     id: "config-audit",
     name: "Config Audit",
-    description: "Logs configuration changes for audit trail",
+    description: "Logs configuration changes into the unified events.jsonl audit trail",
     category: "audit",
     event: "ConfigChange",
     matcher: "",
     canBlock: false,
-    params: [
-        {
-            name: "logFile",
-            type: "string",
-            description: "Path to the audit log file",
-            default: ".claude/hooks/.state/config-audit.log",
-            required: false,
-        },
-    ],
+    params: [],
     tags: ["audit", "config", "logging"],
     template: `#!/bin/bash
 set -euo pipefail
 INPUT=$(cat)
-LOG_FILE="{{{logFile}}}"
-mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null || true
 SOURCE=$(echo "$INPUT" | jq -r '.source // "unknown"' 2>/dev/null)
 FILE=$(echo "$INPUT" | jq -r '.file_path // "unknown"' 2>/dev/null)
-TS=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-echo "{\\"ts\\":\\"$TS\\",\\"source\\":\\"$SOURCE\\",\\"file\\":\\"$FILE\\"}" >> "$LOG_FILE"
+META=$(jq -nc --arg s "$SOURCE" --arg f "$FILE" '{source:$s,file:$f}' 2>/dev/null || true)
+[ -z "$META" ] && META='{"source":"unknown","file":"unknown"}'
+_log_event "allow" "" "$META"
 exit 0`,
 };

package/dist/catalog/blocks/lint-on-save.js

@@ -19,18 +19,52 @@ export const lintOnSave = {
             description: "Lint command to run (e.g. eslint --fix)",
             required: true,
         },
+        {
+            name: "scope",
+            type: "string",
+            description: "Lint scope: 'file' passes $FILE_PATH to command, 'module' runs command without file arg",
+            required: false,
+            default: "file",
+        },
     ],
     tags: ["lint", "auto-fix", "quality", "save"],
     template: `#!/bin/bash
 set -euo pipefail
 INPUT=$(cat)
-FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
-[[ -z "$FILE_PATH" ]] && exit 0
-PATTERN='{{{filePattern}}}'
-BASENAME=$(basename "$FILE_PATH")
-if [[ "$BASENAME" == $PATTERN ]]; then
-  echo "oh-my-harness: Running {{{command}}} on $FILE_PATH..." >&2
-  {{{command}}} "$FILE_PATH" >&2 2>&1 || true
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty' 2>/dev/null)
+FILE_PATHS=()
+DIRECT_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
+[[ -n "$DIRECT_PATH" ]] && FILE_PATHS+=("$DIRECT_PATH")
+if [[ "$TOOL_NAME" == "apply_patch" ]]; then
+  PATCH_TEXT=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
+  if [[ -n "$PATCH_TEXT" ]]; then
+    while IFS= read -r _OMH_HEADER_PATH; do
+      # CRLF patches leave a trailing \\r since sed's $ matches before \\n
+      # only; strip it so filename pattern matching isn't bypassed.
+      _OMH_HEADER_PATH="\${_OMH_HEADER_PATH%$'\\r'}"
+      [[ -n "$_OMH_HEADER_PATH" ]] && FILE_PATHS+=("$_OMH_HEADER_PATH")
+    done < <(printf '%s\\n' "$PATCH_TEXT" | sed -nE 's/^\\*\\*\\* (Add|Update) File: (.+)$/\\2/p')
+  fi
 fi
+[[ \${#FILE_PATHS[@]} -eq 0 ]] && exit 0
+
+PATTERN='{{{filePattern}}}'
+SCOPE='{{{scope}}}'
+_OMH_RAN_MODULE=0
+for FILE_PATH in "\${FILE_PATHS[@]}"; do
+  BASENAME=$(basename "$FILE_PATH")
+  if [[ "$BASENAME" == $PATTERN ]]; then
+    if [[ "\${SCOPE:-file}" == "module" ]]; then
+      if [[ "$_OMH_RAN_MODULE" -eq 0 ]]; then
+        echo "oh-my-harness: Running {{{command}}} ..." >&2
+        {{{command}}} >&2 || true
+        _OMH_RAN_MODULE=1
+      fi
+    else
+      echo "oh-my-harness: Running {{{command}}} on $FILE_PATH..." >&2
+      {{{command}}} "$FILE_PATH" >&2 || true
+    fi
+  fi
+done
 exit 0`,
 };

package/dist/catalog/blocks/lockfile-guard.js

@@ -19,16 +19,34 @@ export const lockfileGuard = {
     template: `#!/bin/bash
 set -euo pipefail
 INPUT=$(cat)
-FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
-[[ -z "$FILE_PATH" ]] && exit 0
-BASENAME=$(basename "$FILE_PATH")
-LOCKFILES=({{#each lockfiles}}"{{{this}}}" {{/each}})
-for LOCKFILE in "\${LOCKFILES[@]}"; do
-  if [[ "$BASENAME" == "$LOCKFILE" ]]; then
-    _log_event "block" "oh-my-harness: direct edits to lockfile $BASENAME are blocked. Use the package manager instead."
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: direct edits to lockfile $BASENAME are blocked. Use the package manager instead.\\"}"
-    exit 0
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty' 2>/dev/null)
+FILE_PATHS=()
+DIRECT_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
+[[ -n "$DIRECT_PATH" ]] && FILE_PATHS+=("$DIRECT_PATH")
+if [[ "$TOOL_NAME" == "apply_patch" ]]; then
+  PATCH_TEXT=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
+  if [[ -n "$PATCH_TEXT" ]]; then
+    while IFS= read -r _OMH_HEADER_PATH; do
+      # CRLF patches leave a trailing \\r since sed's $ matches before \\n
+      # only; strip it so basename/path comparisons aren't bypassed.
+      _OMH_HEADER_PATH="\${_OMH_HEADER_PATH%$'\\r'}"
+      [[ -n "$_OMH_HEADER_PATH" ]] && FILE_PATHS+=("$_OMH_HEADER_PATH")
+    done < <(printf '%s\\n' "$PATCH_TEXT" | sed -nE 's/^\\*\\*\\* (Add|Update|Delete) File: (.+)$/\\2/p')
   fi
+fi
+[[ \${#FILE_PATHS[@]} -eq 0 ]] && exit 0
+
+LOCKFILES=({{#each lockfiles}}"{{{this}}}" {{/each}})
+for FILE_PATH in "\${FILE_PATHS[@]}"; do
+  BASENAME=$(basename "$FILE_PATH")
+  for LOCKFILE in "\${LOCKFILES[@]}"; do
+    if [[ "$BASENAME" == "$LOCKFILE" ]]; then
+      REASON="oh-my-harness: direct edits to lockfile $BASENAME are blocked. Use the package manager instead."
+      _log_event "block" "$REASON"
+      _emit_decision "block" "$REASON"
+      exit 0
+    fi
+  done
 done
 exit 0`,
 };

package/dist/catalog/blocks/path-guard.js

@@ -18,47 +18,72 @@ export const pathGuard = {
     template: `#!/bin/bash
 set -euo pipefail
 INPUT=$(cat)
-FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
-[[ -z "$FILE_PATH" ]] && exit 0
-# Normalize path to prevent directory traversal attacks (e.g., ./foo/../dist/secret.js -> dist/secret.js)
-if command -v python3 >/dev/null 2>&1; then
-  if ! NORMALIZED=$(python3 -c "import os,sys; print(os.path.normpath(sys.argv[1]))" "$FILE_PATH" 2>/dev/null); then
-    _log_event "block" "oh-my-harness: path normalization unavailable for non-canonical path"
-    echo "{\\"decision\\": \\\"block\\\", \\\"reason\\\": \\\"oh-my-harness: path normalization unavailable for non-canonical path\\\"}"
-    exit 0
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty' 2>/dev/null)
+# Collect file paths. Claude Edit/Write expose tool_input.file_path directly;
+# Codex apply_patch ships the patch text in tool_input.command and encodes
+# paths in "*** {Add|Update|Delete} File: <path>" headers.
+FILE_PATHS=()
+DIRECT_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
+[[ -n "$DIRECT_PATH" ]] && FILE_PATHS+=("$DIRECT_PATH")
+if [[ "$TOOL_NAME" == "apply_patch" ]]; then
+  PATCH_TEXT=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
+  if [[ -n "$PATCH_TEXT" ]]; then
+    while IFS= read -r _OMH_HEADER_PATH; do
+      # CRLF patches leave a trailing \\r since sed's $ matches before \\n
+      # only; strip it so basename/path comparisons aren't bypassed.
+      _OMH_HEADER_PATH="\${_OMH_HEADER_PATH%$'\\r'}"
+      [[ -n "$_OMH_HEADER_PATH" ]] && FILE_PATHS+=("$_OMH_HEADER_PATH")
+    done < <(printf '%s\\n' "$PATCH_TEXT" | sed -nE 's/^\\*\\*\\* (Add|Update|Delete) File: (.+)$/\\2/p')
   fi
-else
-  case "$FILE_PATH" in
-    /*|../*|*/../*|*/..|./*|*/./*|*/.)
-      _log_event "block" "oh-my-harness: path normalization unavailable for non-canonical path"
-      echo "{\\"decision\\": \\\"block\\\", \\\"reason\\\": \\\"oh-my-harness: path normalization unavailable for non-canonical path\\\"}"
-      exit 0
-      ;;
-  esac
-  NORMALIZED="$FILE_PATH"
 fi
+[[ \${#FILE_PATHS[@]} -eq 0 ]] && exit 0
+
 BLOCKED_PATHS=({{#each blockedPaths}}"{{{this}}}" {{/each}})
-for BLOCKED in "\${BLOCKED_PATHS[@]}"; do
-  if [[ "$BLOCKED" == */ ]]; then
-    if [[ "$NORMALIZED" == "$BLOCKED"* || "$NORMALIZED" == *"/$BLOCKED"* ]]; then
-      _log_event "block" "oh-my-harness: file path matches blocked directory: $BLOCKED"
-      echo "{\\"decision\\": \\\"block\\\", \\\"reason\\\": \\\"oh-my-harness: file path matches blocked directory: $BLOCKED\\\"}"
-      exit 0
-    fi
-  elif [[ "$BLOCKED" == \\** ]]; then
-    PATTERN="\${BLOCKED#\\*}"
-    if [[ "$NORMALIZED" == *"$PATTERN" ]]; then
-      _log_event "block" "oh-my-harness: file path matches blocked pattern: $BLOCKED"
-      echo "{\\"decision\\": \\\"block\\\", \\\"reason\\\": \\\"oh-my-harness: file path matches blocked pattern: $BLOCKED\\\"}"
+for FILE_PATH in "\${FILE_PATHS[@]}"; do
+  # Normalize each path to prevent directory traversal attacks (e.g., ./foo/../dist/secret.js -> dist/secret.js)
+  if command -v python3 >/dev/null 2>&1; then
+    if ! NORMALIZED=$(python3 -c "import os,sys; print(os.path.normpath(sys.argv[1]))" "$FILE_PATH" 2>/dev/null); then
+      REASON="oh-my-harness: path normalization unavailable for non-canonical path"
+      _log_event "block" "$REASON"
+      _emit_decision "block" "$REASON"
       exit 0
     fi
   else
-    if [[ "$NORMALIZED" == "$BLOCKED" || "$NORMALIZED" == *"/$BLOCKED" ]]; then
-      _log_event "block" "oh-my-harness: file path matches blocked path: $BLOCKED"
-      echo "{\\"decision\\": \\\"block\\\", \\\"reason\\\": \\\"oh-my-harness: file path matches blocked path: $BLOCKED\\\"}"
-      exit 0
-    fi
+    case "$FILE_PATH" in
+      /*|../*|*/../*|*/..|./*|*/./*|*/.)
+        REASON="oh-my-harness: path normalization unavailable for non-canonical path"
+        _log_event "block" "$REASON"
+        _emit_decision "block" "$REASON"
+        exit 0
+        ;;
+    esac
+    NORMALIZED="$FILE_PATH"
   fi
+  for BLOCKED in "\${BLOCKED_PATHS[@]}"; do
+    if [[ "$BLOCKED" == */ ]]; then
+      if [[ "$NORMALIZED" == "$BLOCKED"* || "$NORMALIZED" == *"/$BLOCKED"* ]]; then
+        REASON="oh-my-harness: file path matches blocked directory: $BLOCKED"
+        _log_event "block" "$REASON"
+        _emit_decision "block" "$REASON"
+        exit 0
+      fi
+    elif [[ "$BLOCKED" == \\** ]]; then
+      PATTERN="\${BLOCKED#\\*}"
+      if [[ "$NORMALIZED" == *"$PATTERN" ]]; then
+        REASON="oh-my-harness: file path matches blocked pattern: $BLOCKED"
+        _log_event "block" "$REASON"
+        _emit_decision "block" "$REASON"
+        exit 0
+      fi
+    else
+      if [[ "$NORMALIZED" == "$BLOCKED" || "$NORMALIZED" == *"/$BLOCKED" ]]; then
+        REASON="oh-my-harness: file path matches blocked path: $BLOCKED"
+        _log_event "block" "$REASON"
+        _emit_decision "block" "$REASON"
+        exit 0
+      fi
+    fi
+  done
 done
 exit 0`,
 };

package/dist/catalog/blocks/secret-file-guard.js

@@ -19,16 +19,34 @@ export const secretFileGuard = {
     template: `#!/bin/bash
 set -euo pipefail
 INPUT=$(cat)
-FILE_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
-[[ -z "$FILE_PATH" ]] && exit 0
-BASENAME=$(basename "$FILE_PATH")
-PATTERNS=({{#each patterns}}"{{{this}}}" {{/each}})
-for PATTERN in "\${PATTERNS[@]}"; do
-  if [[ "$BASENAME" == $PATTERN ]]; then
-    _log_event "block" "oh-my-harness: file $BASENAME matches secret file pattern: $PATTERN"
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: file $BASENAME matches secret file pattern: $PATTERN\\"}"
-    exit 0
+TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty' 2>/dev/null)
+FILE_PATHS=()
+DIRECT_PATH=$(echo "$INPUT" | jq -r '.tool_input.file_path // .tool_input.path // empty' 2>/dev/null)
+[[ -n "$DIRECT_PATH" ]] && FILE_PATHS+=("$DIRECT_PATH")
+if [[ "$TOOL_NAME" == "apply_patch" ]]; then
+  PATCH_TEXT=$(echo "$INPUT" | jq -r '.tool_input.command // empty' 2>/dev/null)
+  if [[ -n "$PATCH_TEXT" ]]; then
+    while IFS= read -r _OMH_HEADER_PATH; do
+      # CRLF patches leave a trailing \\r since sed's $ matches before \\n
+      # only; strip it so basename/path comparisons aren't bypassed.
+      _OMH_HEADER_PATH="\${_OMH_HEADER_PATH%$'\\r'}"
+      [[ -n "$_OMH_HEADER_PATH" ]] && FILE_PATHS+=("$_OMH_HEADER_PATH")
+    done < <(printf '%s\\n' "$PATCH_TEXT" | sed -nE 's/^\\*\\*\\* (Add|Update|Delete) File: (.+)$/\\2/p')
   fi
+fi
+[[ \${#FILE_PATHS[@]} -eq 0 ]] && exit 0
+
+PATTERNS=({{#each patterns}}"{{{this}}}" {{/each}})
+for FILE_PATH in "\${FILE_PATHS[@]}"; do
+  BASENAME=$(basename "$FILE_PATH")
+  for PATTERN in "\${PATTERNS[@]}"; do
+    if [[ "$BASENAME" == $PATTERN ]]; then
+      REASON="oh-my-harness: file $BASENAME matches secret file pattern: $PATTERN"
+      _log_event "block" "$REASON"
+      _emit_decision "block" "$REASON"
+      exit 0
+    fi
+  done
 done
 exit 0`,
 };

package/dist/catalog/blocks/sql-guard.js

@@ -26,7 +26,9 @@ PATTERNS=({{#each patterns}}"{{{this}}}" {{/each}})
 for PATTERN in "\${PATTERNS[@]}"; do
   PATTERN_LOWER=$(echo "$PATTERN" | tr '[:upper:]' '[:lower:]')
   if echo "$COMMAND_LOWER" | grep -qF -- "$PATTERN_LOWER"; then
-    echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: SQL command matches blocked pattern: $PATTERN\\"}"
+    REASON="oh-my-harness: SQL command matches blocked pattern: $PATTERN"
+    _log_event "block" "$REASON"
+    _emit_decision "block" "$REASON"
     exit 0
   fi
 done

package/dist/catalog/blocks/tdd-guard.js

@@ -33,9 +33,9 @@ case "\$FILE_PATH" in
   *.json|*.yaml|*.yml|*.md|*.sh|*.css|*.html|*.svg|*.png|*.jpg) exit 0 ;;
 esac
 
-# edit-history 상태 파일
-STATE_DIR=".claude/hooks/.state"
-HISTORY_FILE="\$STATE_DIR/edit-history.json"
+# edit-history 상태 파일 (logger wrapper가 _OMH_STATE_DIR 를 export)
+STATE_DIR="\${_OMH_STATE_DIR:-.omh/state}"
+HISTORY_FILE="\$STATE_DIR/tdd-edits.json"
 mkdir -p "\$STATE_DIR" 2>/dev/null || true
 
 TEST_RE='{{{testPattern}}}'
@@ -62,19 +62,20 @@ fi
 
 # 대응 테스트 파일 확인 — 확장자 제거
 BASENAME=$(basename "\$FILE_PATH" | sed -E 's/\\.[^.]+$//')
-TEST_SUFFIX=".test."
 
+REASON="oh-my-harness: TDD — \${BASENAME} 에 대응하는 테스트 파일을 먼저 수정하세요"
 if [[ ! -f "\$HISTORY_FILE" ]]; then
-  _log_event "block" "oh-my-harness: TDD — \${BASENAME}\${TEST_SUFFIX}* 테스트 파일을 먼저 수정하세요"
-  echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: TDD — \${BASENAME}\${TEST_SUFFIX}* 테스트 파일을 먼저 수정하세요\\"}"
+  _log_event "block" "\$REASON"
+  _emit_decision "block" "\$REASON"
   exit 0
 fi
 
 # edit-history에서 테스트 파일 검색 (tmp+mv로 원자적 쓰기, 크로스 플랫폼)
-if jq -e --arg b "\$BASENAME" '.edits[] | select(contains($b) and (contains(".test.") or contains(".spec.") or contains("test_")))' "\$HISTORY_FILE" >/dev/null 2>&1; then
+# Supports JS/TS (.test. / .spec. / test_) and JVM (Test suffix, e.g. IoViewTest.kt) conventions
+if jq -e --arg b "\$BASENAME" '.edits[] | select(contains($b) and (contains(".test.") or contains(".spec.") or contains("test_") or endswith("Test.kt") or endswith("Test.java")))' "\$HISTORY_FILE" >/dev/null 2>&1; then
   # 테스트 먼저 수정됨 → 매칭 테스트 기록 소비(제거) + 소스 기록 + 통과
   UPDATED=$(jq --arg b "\$BASENAME" --arg f "\$FILE_PATH" '
-    .edits |= [.[] | select((contains($b) and (contains(".test.") or contains(".spec.") or contains("test_"))) | not)]
+    .edits |= [.[] | select((contains($b) and (contains(".test.") or contains(".spec.") or contains("test_") or endswith("Test.kt") or endswith("Test.java"))) | not)]
     | .edits += [$f] | .edits |= unique
   ' "\$HISTORY_FILE" 2>/dev/null) || true
   if [[ -n "\$UPDATED" ]]; then
@@ -89,8 +90,8 @@ if [[ "\$DECISION" == "allow" ]]; then
   exit 0
 fi
 
-_log_event "block" "oh-my-harness: TDD — \${BASENAME}\${TEST_SUFFIX}* 테스트 파일을 먼저 수정하세요"
-echo "{\\"decision\\": \\"block\\", \\"reason\\": \\"oh-my-harness: TDD — \${BASENAME}\${TEST_SUFFIX}* 테스트 파일을 먼저 수정하세요\\"}"
+_log_event "block" "\$REASON"
+_emit_decision "block" "\$REASON"
 exit 0`,
     tags: ["tdd", "workflow", "quality"],
 };

package/dist/catalog/converter.js

@@ -1,4 +1,5 @@
 import { renderTemplate, validateParams, applyDefaults } from "./template-engine.js";
+import { OMH_HOOKS_DIR } from "../utils/paths.js";
 export async function convertHookEntries(entries, registry, _projectDir) {
     const hooksConfig = {};
     const scripts = new Map();
@@ -28,7 +29,7 @@ export async function convertHookEntries(entries, registry, _projectDir) {
         const count = blockInstanceCount.get(entry.block) ?? 0;
         blockInstanceCount.set(entry.block, count + 1);
         const scriptName = count === 0 ? `${entry.block}.sh` : `${entry.block}-${count}.sh`;
-        const scriptPath = `.claude/hooks/${scriptName}`;
+        const scriptPath = `${OMH_HOOKS_DIR}/${scriptName}`;
         scripts.set(scriptPath, scriptContent);
         const hookEntry = {
             type: "command",