repo-nexus 0.5.2 → 0.5.4

package/CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to Repo Nexus (`rnex`) will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- **Explicit `git_hooks` Workspace Configuration (`rnex.yaml` & `.local.rnex.yaml`)**:
+  - Top-level `git_hooks: true|false` setting establishes the workspace configuration as the single source of truth for automated Git hooks.
+  - Two-level configuration support allowing per-workstation overrides in `.local.rnex.yaml` (e.g. keeping hooks globally enabled in `rnex.yaml` while disabling locally via `rnex hooks uninstall --local`).
+  - `rnex hooks install [--local]` and `rnex hooks uninstall [--local]` record preference directly to `rnex.yaml` or `.local.rnex.yaml`.
+  - `rnex fix` (and `rnex sync`) automatically reconciles Git's `core.hooksPath` against the resolved `git_hooks` configuration.
+  - Interactive `rnex init` determines and records `git_hooks` preference upfront in new workspaces.
+  - Workspace schema migration in `rnex update` and `rnex fix -y` non-destructively inserts `git_hooks` into older configurations.
+  - `rnex status` and `rnex hooks status` display configuration state alongside runtime Git hooks status.
+
+### Fixed
+- **Git Hooks Self-Rewrite & Wrapper Preservation**:
+  - Resolved self-rewrite bug where `rnex hooks run post-merge` invoked `cmd_fix`, which truncated and replaced `.rnex/hooks/post-merge` while the shell interpreter was actively executing it.
+  - Added in-hook execution guard (`_RNEX_INSIDE_HOOK=1`) preventing hook script regeneration during active hook dispatch.
+  - Preserved custom / repository-owned wrappers in `.rnex/hooks/` that are not auto-managed by `rnex`.
+  - Added `cmp -s` check before writing hook files to eliminate unnecessary file churn and in-place overwrites.
+  - Automatically chain to existing repository-owned `.githooks/` scripts if present.
+
 ## [0.5.1] - 2026-10-08
 
 ### Added

package/README.md

@@ -245,6 +245,9 @@ The `karpathy-llm` plugin packages Andrej Karpathy's verified LLM agent design p
 # Directory for member repository clones
 repos_dir: ./repos
 
+# Automated workspace Git hooks (default: true)
+git_hooks: true
+
 # Workspace plugins
 plugins:
   karpathy-llm: {}
@@ -301,7 +304,7 @@ repos:
 | `rnex rnex-dir <enable\|disable> <name>` | Toggle `.rnex/` directory integration for a member repository |
 | `rnex fix [-y] [--quiet]` (or `sync`) | Reconcile workspace repositories, plugins, prompts, and member `.rnex/` directories |
 | `rnex update [-y]` (or `upgrade`) | Safely upgrade workspace configuration schema and routing instructions |
-| `rnex hooks <install\|uninstall\|status>` | Manage config-driven automated Git hooks (`.rnex/hooks`) |
+| `rnex hooks <install\|uninstall\|status> [--local]` | Manage automated Git hooks (`.rnex/hooks` and `git_hooks: true\|false`) |
 | `rnex plugin <list\|info\|enable\|disable>` | Manage workspace plugins |
 | `rnex completion <bash\|zsh\|fish>` | Generate shell auto-completion script |
 

package/docs/CLI.md

@@ -316,26 +316,35 @@ rnex rnex-dir <enable|disable> <name>
 
 ## Git Hooks Automation Commands
 
-Repo Nexus manages workspace-level Git hooks via `git config core.hooksPath .rnex/hooks`. The hooks are native shell scripts that dynamically evaluate configuration triggers in `rnex.yaml` and `.local.rnex.yaml`.
+Repo Nexus manages workspace-level Git hooks via `git config core.hooksPath .rnex/hooks` and configuration in `rnex.yaml` (`git_hooks: true|false`). The hooks are native shell scripts that dynamically evaluate configuration triggers in `rnex.yaml` and `.local.rnex.yaml`.
 
 ```sh
-rnex hooks <install|uninstall|status>
+rnex hooks <install|uninstall|status> [--local]
 ```
 
+### Configuration (`rnex.yaml` / `.local.rnex.yaml`)
+```yaml
+# Enable or disable automated Git hooks
+git_hooks: true   # default: true (when in a Git repository)
+```
+- When `git_hooks: true`, `rnex fix` ensures hooks are installed and up to date.
+- When `git_hooks: false`, `rnex fix` disables and uninstalls hooks from Git.
+- Overrides can be placed in `.local.rnex.yaml` to disable hooks locally without modifying team config.
+
 ### Subcommands
 
-#### `rnex hooks install`
-Installs native hook dispatchers into `.rnex/hooks/` and configures Git:
+#### `rnex hooks install [--local]`
+Installs native hook dispatchers into `.rnex/hooks/`, sets `core.hooksPath = .rnex/hooks`, and records `git_hooks: true` in `rnex.yaml` (or `.local.rnex.yaml` if `--local` is passed):
 - **`post-merge`**: Automatically runs `rnex fix -y --quiet` whenever you run `git pull` or merge upstream changes, ensuring new repositories or plugin additions sync instantly.
 - **`post-commit`**: Evaluates `lint_trigger: git-post-commit`. If `/raw/` or `/wiki/` files were committed, alerts the user to run maintenance workflows.
 - **`pre-commit`**: Evaluates `lint_trigger: git-pre-commit`. Validates staged files before committing.
 - **`pre-push`**: Evaluates `lint_trigger: git-pre-push`. Validates changes before pushing to remote.
 
 #### `rnex hooks status`
-Displays the active `core.hooksPath`, installed hook scripts, and plugin triggers detected in `rnex.yaml`.
+Displays the configuration setting (`git_hooks: true/false`), active `core.hooksPath`, installed hook scripts, and plugin triggers detected in `rnex.yaml`.
 
-#### `rnex hooks uninstall`
-Unsets `core.hooksPath` in Git configuration and removes `.rnex/hooks/`.
+#### `rnex hooks uninstall [--local]`
+Unsets `core.hooksPath` in Git configuration, removes `.rnex/hooks/`, and records `git_hooks: false` in `rnex.yaml` (or `.local.rnex.yaml` if `--local` is passed).
 
 ---
 

package/docs/rnex.example.yaml

@@ -59,6 +59,20 @@ ai_instructions: AGENTS.md
 #
 code_workspace: false
 
+# ------------------------------------------------------------------------------
+# git_hooks — Automated workspace Git hooks
+# ------------------------------------------------------------------------------
+# Enables automated Git hooks in `.rnex/hooks/` (post-merge auto-sync and
+# optional plugin triggers like Karpathy wiki lint on commit/push).
+#
+# Default: true (when initialized in a Git repository)
+#
+# Examples:
+#   git_hooks: true     # active (core.hooksPath = .rnex/hooks)
+#   git_hooks: false    # disabled
+#
+git_hooks: true
+
 # ------------------------------------------------------------------------------
 # plugins — Workspace plugins and AI instruction packs
 # ------------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repo-nexus",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Lightweight, zero-dependency Virtual Meta-Repo companion for multi-repo workspaces and shared AI context (no git submodules)",
   "bin": {
     "repo-nexus": "rnex",

package/rnex

@@ -146,6 +146,7 @@ require_workspace() {
     _load_repos_dir
     _load_ai_instructions_file
     _load_code_workspace
+    _load_git_hooks
     log_info "Using workspace at ${_BOLD}$NEXUS_DIR${_NC} ${_DIM}(via config: $WORKSPACE_YAML)${_NC}"
     return 0
   fi
@@ -175,6 +176,7 @@ require_workspace() {
   _load_repos_dir
   _load_ai_instructions_file
   _load_code_workspace
+  _load_git_hooks
 
   log_info "Using workspace at ${_BOLD}$NEXUS_DIR${_NC} ${_DIM}($(basename "$WORKSPACE_YAML") found)${_NC}"
 }
@@ -254,6 +256,18 @@ _load_code_workspace() {
   esac
 }
 
+_load_git_hooks() {
+  _gh=""
+  if [ -f "$WORKSPACE_LOCAL_YAML" ]; then
+    _gh="$(awk '/^(git_hooks|hooks):/ { sub(/^[a-zA-Z0-9_]+:[ ]*/, ""); sub(/[ ]*#.*/, ""); val=$0 } END { if (val) print val }' "$WORKSPACE_LOCAL_YAML")"
+  fi
+  if [ -z "$_gh" ] && [ -f "$WORKSPACE_YAML" ]; then
+    _gh="$(awk '/^(git_hooks|hooks):/ { sub(/^[a-zA-Z0-9_]+:[ ]*/, ""); sub(/[ ]*#.*/, ""); val=$0 } END { if (val) print val }' "$WORKSPACE_YAML")"
+  fi
+  _gh="$(echo "$_gh" | tr -d " \t\r\n'\"")"
+  GIT_HOOKS_CONFIG="$_gh"
+}
+
 # ---- YAML Parser / Manipulator (for rnex.yaml & .local.rnex.yaml) ----------
 
 _yaml_list_plugins_from_file() {
@@ -575,6 +589,60 @@ EOF
   _yaml_set_in_file "$WORKSPACE_LOCAL_YAML" "$_repo" "$_field" "$_value"
 }
 
+_yaml_set_top_level_in_file() {
+  _file="$1"
+  _key="$2"
+  _val="$3"
+  [ -f "$_file" ] || return 0
+  _tmp="$(mktemp)"
+  if grep -q "^[ ]*${_key}:" "$_file" 2>/dev/null; then
+    awk -v key="$_key" -v val="$_val" '
+      $0 ~ ("^[ ]*" key ":") {
+        print key ": " val
+        next
+      }
+      { print }
+    ' "$_file" > "$_tmp" && mv "$_tmp" "$_file"
+  else
+    awk -v key="$_key" -v val="$_val" '
+      BEGIN { inserted=0 }
+      /^[ ]*(plugins|repos):/ && !inserted {
+        print key ": " val
+        print ""
+        inserted=1
+      }
+      { print }
+      END {
+        if (!inserted) {
+          print ""
+          print key ": " val
+        }
+      }
+    ' "$_file" > "$_tmp" && mv "$_tmp" "$_file"
+  fi
+  rm -f "$_tmp"
+}
+
+yaml_set_top_level() {
+  _key="$1"; _val="$2"
+  _yaml_set_top_level_in_file "$WORKSPACE_YAML" "$_key" "$_val"
+}
+
+yaml_set_top_level_local() {
+  _key="$1"; _val="$2"
+  if [ ! -f "$WORKSPACE_LOCAL_YAML" ]; then
+    cat <<'EOF' > "$WORKSPACE_LOCAL_YAML"
+# ==============================================================================
+# .local.rnex.yaml — Repo Nexus Local Configuration (Machine-Specific)
+# ==============================================================================
+# This file is gitignored. Use it to specify local repository paths, overrides,
+# and enable/disable states for this workstation.
+
+EOF
+  fi
+  _yaml_set_top_level_in_file "$WORKSPACE_LOCAL_YAML" "$_key" "$_val"
+}
+
 # ---- Physical Repository Path Resolution ----------------------------------
 
 resolve_repo_path() {
@@ -1159,28 +1227,66 @@ upgrade_workspace_config() {
     ' "$_f" > "$_tmp" && mv "$_tmp" "$_f"
   fi
 
+  # 4. Add git_hooks if missing
+  if ! grep -q '^[ ]*\(git_hooks\|hooks\):' "$_f" 2>/dev/null; then
+    _def_gh="false"
+    _cur_hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
+    if [ "$_cur_hp" = ".rnex/hooks" ] || [ "$_cur_hp" = "$NEXUS_DIR/.rnex/hooks" ]; then
+      _def_gh="true"
+    fi
+    awk -v def_gh="$_def_gh" '
+      BEGIN { inserted=0 }
+      /^[ ]*(plugins|repos):/ && !inserted {
+        print "# Automated workspace Git hooks (default: true; e.g. post-merge auto-sync, plugin triggers)"
+        print "git_hooks: " def_gh
+        print ""
+        inserted=1
+      }
+      { print }
+      END {
+        if (!inserted) {
+          print ""
+          print "git_hooks: " def_gh
+        }
+      }
+    ' "$_f" > "$_tmp" && mv "$_tmp" "$_f"
+  fi
+
   rm -f "$_tmp"
 }
 
 _create_hook_script() {
   _dst="$1"
   _hook_type="$2"
-  cat > "$_dst" <<'HOOK_EOF'
+
+  # Preserve custom / repository-owned wrappers that are not auto-managed by rnex
+  if [ -f "$_dst" ] && ! grep -q "Managed automatically by rnex" "$_dst" 2>/dev/null; then
+    return 0
+  fi
+
+  _sub_tmp="$(mktemp)"
+  cat > "$_sub_tmp" <<HOOK_EOF
 #!/bin/sh
-# Repo Nexus Git Hook: __HOOK_TYPE__
+# Repo Nexus Git Hook: $_hook_type
 # Managed automatically by rnex. Do not edit manually.
 
-_dir="$(cd "$(dirname "$0")/../.." 2>/dev/null && pwd -P)"
+_dir="\$(cd "\$(dirname "\$0")/../.." 2>/dev/null && pwd -P)"
 if command -v rnex >/dev/null 2>&1; then
-  rnex hooks run __HOOK_TYPE__ "$@"
-elif [ -f "$_dir/rnex" ]; then
-  "$_dir/rnex" hooks run __HOOK_TYPE__ "$@"
+  rnex hooks run $_hook_type "\$@"
+elif [ -f "\$_dir/rnex" ]; then
+  "\$_dir/rnex" hooks run $_hook_type "\$@"
 fi
 HOOK_EOF
-  _sub_tmp="$(mktemp)"
-  sed "s/__HOOK_TYPE__/$_hook_type/g" "$_dst" > "$_sub_tmp" && mv "$_sub_tmp" "$_dst"
-  rm -f "$_sub_tmp"
-  chmod +x "$_dst"
+
+  chmod +x "$_sub_tmp"
+
+  # Avoid rewriting / modifying file if already identical (prevents inode churn & self-rewrite)
+  if [ -f "$_dst" ] && cmp -s "$_sub_tmp" "$_dst"; then
+    rm -f "$_sub_tmp"
+    return 0
+  fi
+
+  mv "$_sub_tmp" "$_dst"
 }
 
 cmd_hooks_install_dir() {
@@ -1212,11 +1318,43 @@ cmd_hooks() {
   case "${1:-status}" in
     install)
       require_workspace
+      _local=0
+      shift || true
+      while [ $# -gt 0 ]; do
+        case "$1" in
+          --local) _local=1 ;;
+        esac
+        shift
+      done
       cmd_hooks_install_dir "$NEXUS_DIR"
+      if [ "$_local" -eq 1 ]; then
+        yaml_set_top_level_local "git_hooks" "true"
+        log_dim "Recorded git_hooks: true in $RNEX_LOCAL_CONFIG_FILE"
+      else
+        yaml_set_top_level "git_hooks" "true"
+        log_dim "Recorded git_hooks: true in $RNEX_CONFIG_FILE"
+      fi
+      _load_git_hooks
       ;;
     uninstall)
       require_workspace
+      _local=0
+      shift || true
+      while [ $# -gt 0 ]; do
+        case "$1" in
+          --local) _local=1 ;;
+        esac
+        shift
+      done
       cmd_hooks_uninstall_dir "$NEXUS_DIR"
+      if [ "$_local" -eq 1 ]; then
+        yaml_set_top_level_local "git_hooks" "false"
+        log_dim "Recorded git_hooks: false in $RNEX_LOCAL_CONFIG_FILE"
+      else
+        yaml_set_top_level "git_hooks" "false"
+        log_dim "Recorded git_hooks: false in $RNEX_CONFIG_FILE"
+      fi
+      _load_git_hooks
       ;;
     status)
       require_workspace
@@ -1224,6 +1362,13 @@ cmd_hooks() {
       printf '=%.0s' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
       printf '\n\n'
 
+      printf '  %b●%b Configuration:  ' "$_DIM" "$_NC"
+      case "$GIT_HOOKS_CONFIG" in
+        true|yes|1) printf '%bgit_hooks: true%b %b(enabled in config)%b\n' "$_G" "$_NC" "$_DIM" "$_NC" ;;
+        false|no|0) printf '%bgit_hooks: false%b %b(disabled in config)%b\n' "$_Y" "$_NC" "$_DIM" "$_NC" ;;
+        *)          printf '%bnot configured%b %b(defaults to active if git repo)%b\n' "$_DIM" "$_NC" "$_DIM" "$_NC" ;;
+      esac
+
       _hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
       if [ "$_hp" = ".rnex/hooks" ] || [ "$_hp" = "$NEXUS_DIR/.rnex/hooks" ]; then
         printf '  %b●%b core.hooksPath: %s %b(active)%b\n' "$_G" "$_NC" "$_hp" "$_DIM" "$_NC"
@@ -1258,6 +1403,7 @@ cmd_hooks() {
       shift
       _hook_name="$1"
       shift || true
+      export _RNEX_INSIDE_HOOK=1
       require_workspace
       case "$_hook_name" in
         post-merge)
@@ -1271,6 +1417,9 @@ cmd_hooks() {
               fi
             fi
           fi
+          if [ -x "$NEXUS_DIR/.githooks/post-merge" ]; then
+            "$NEXUS_DIR/.githooks/post-merge" "$@" || true
+          fi
           return 0
           ;;
         post-commit)
@@ -1284,6 +1433,9 @@ cmd_hooks() {
               fi
             fi
           fi
+          if [ -x "$NEXUS_DIR/.githooks/post-commit" ]; then
+            "$NEXUS_DIR/.githooks/post-commit" "$@" || true
+          fi
           return 0
           ;;
         pre-commit)
@@ -1297,6 +1449,9 @@ cmd_hooks() {
               fi
             fi
           fi
+          if [ -x "$NEXUS_DIR/.githooks/pre-commit" ]; then
+            "$NEXUS_DIR/.githooks/pre-commit" "$@" || return $?
+          fi
           return 0
           ;;
         pre-push)
@@ -1306,6 +1461,9 @@ cmd_hooks() {
               printf '%b[WIKI]%b Pre-push trigger: verifying wiki changes.\n' "$_C" "$_NC"
             fi
           fi
+          if [ -x "$NEXUS_DIR/.githooks/pre-push" ]; then
+            "$NEXUS_DIR/.githooks/pre-push" "$@" || return $?
+          fi
           return 0
           ;;
       esac
@@ -1373,6 +1531,29 @@ cmd_init() {
   fi
   mkdir -p "$_target_dir"
 
+  _is_git_ws=0
+  if git -C "$_target_dir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    _is_git_ws=1
+  fi
+
+  _init_git_hooks="false"
+  if [ "$_is_git_ws" -eq 1 ]; then
+    if [ "$_cli_no_hooks" -eq 1 ] || [ "$_cli_hooks" = "false" ]; then
+      _init_git_hooks="false"
+    elif [ "$_cli_hooks" = "true" ] || [ "$_non_interactive" -eq 1 ]; then
+      _init_git_hooks="true"
+    elif [ -t 0 ]; then
+      printf '%bConfigure automated Git hooks (post-merge auto-sync & wiki triggers)? [Y/n]: %b' "$_BOLD" "$_NC"
+      read -r _h_ans
+      case "$_h_ans" in
+        n*|N*) _init_git_hooks="false" ;;
+        *) _init_git_hooks="true" ;;
+      esac
+    else
+      _init_git_hooks="true"
+    fi
+  fi
+
   # ---- 1. Create config file if none exists ---------------------------------
   _config_created=0
   if [ -f "$_target_yaml" ]; then
@@ -1396,6 +1577,9 @@ ai_instructions: ${_cli_ai_instructions:-AGENTS.md}
 # VS Code / Cursor multi-root workspace file (default: false; e.g. true or workspace.code-workspace)
 code_workspace: ${_cli_code_workspace:-false}
 
+# Automated workspace Git hooks (default: true; e.g. post-merge auto-sync, plugin triggers)
+git_hooks: $_init_git_hooks
+
 # Workspace plugins
 plugins:
 
@@ -1479,22 +1663,11 @@ YAML_EOF
   fi
 
   # ---- 7. Setup automated Git hooks if inside a Git repository ------------
-  if git -C "$_target_dir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-    if [ "$_cli_no_hooks" -eq 1 ] || [ "$_cli_hooks" = "false" ]; then
-      log_dim "Skipping Git hooks setup (--no-hooks specified)"
-    elif [ "$_cli_hooks" = "true" ] || [ "$_non_interactive" -eq 1 ]; then
+  if [ "$_is_git_ws" -eq 1 ]; then
+    if [ "$_init_git_hooks" = "true" ]; then
       cmd_hooks_install_dir "$_target_dir"
     else
-      if [ -t 0 ]; then
-        printf '%bConfigure automated Git hooks (post-merge auto-sync & wiki triggers)? [Y/n]: %b' "$_BOLD" "$_NC"
-        read -r _h_ans
-        case "$_h_ans" in
-          n*|N*) log_dim "Skipping Git hooks setup (run 'rnex hooks install' later)" ;;
-          *) cmd_hooks_install_dir "$_target_dir" ;;
-        esac
-      else
-        cmd_hooks_install_dir "$_target_dir"
-      fi
+      log_dim "Skipping Git hooks setup (run 'rnex hooks install' later to enable)"
     fi
   fi
 
@@ -1820,19 +1993,50 @@ cmd_status() {
   fi
 
   _hooks_path="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
+  _gh_active=0
   if [ "$_hooks_path" = ".rnex/hooks" ] || [ "$_hooks_path" = "$NEXUS_DIR/.rnex/hooks" ]; then
-    _active_trigger=""
-    if yaml_has_plugin "karpathy-llm"; then
-      _active_trigger="$(yaml_plugin_get "karpathy-llm" "lint_trigger")"
-    fi
-    if [ -n "$_active_trigger" ]; then
-      printf '  %b✓%b Git Hooks:     active (.rnex/hooks — post-merge auto-sync, %s)\n' "$_G" "$_NC" "$_active_trigger"
-    else
-      printf '  %b✓%b Git Hooks:     active (.rnex/hooks — post-merge auto-sync)\n' "$_G" "$_NC"
-    fi
-  else
-    printf '  %b○%b Git Hooks:     not configured (run "rnex hooks install" to enable)\n' "$_DIM" "$_NC"
+    _gh_active=1
   fi
+
+  case "$GIT_HOOKS_CONFIG" in
+    false|no|0)
+      if [ "$_gh_active" -eq 1 ]; then
+        printf '  %b!%b Git Hooks:     active in Git, but disabled in config (git_hooks: false; run "rnex fix" to reconcile)\n' "$_Y" "$_NC"
+      else
+        printf '  %b○%b Git Hooks:     disabled in configuration (git_hooks: false)\n' "$_DIM" "$_NC"
+      fi
+      ;;
+    true|yes|1)
+      if [ "$_gh_active" -eq 1 ]; then
+        _active_trigger=""
+        if yaml_has_plugin "karpathy-llm"; then
+          _active_trigger="$(yaml_plugin_get "karpathy-llm" "lint_trigger")"
+        fi
+        if [ -n "$_active_trigger" ]; then
+          printf '  %b✓%b Git Hooks:     active (git_hooks: true, .rnex/hooks — %s)\n' "$_G" "$_NC" "$_active_trigger"
+        else
+          printf '  %b✓%b Git Hooks:     active (git_hooks: true, .rnex/hooks — post-merge auto-sync)\n' "$_G" "$_NC"
+        fi
+      else
+        printf '  %b!%b Git Hooks:     enabled in config (git_hooks: true), but not active in Git (run "rnex fix")\n' "$_Y" "$_NC"
+      fi
+      ;;
+    *)
+      if [ "$_gh_active" -eq 1 ]; then
+        _active_trigger=""
+        if yaml_has_plugin "karpathy-llm"; then
+          _active_trigger="$(yaml_plugin_get "karpathy-llm" "lint_trigger")"
+        fi
+        if [ -n "$_active_trigger" ]; then
+          printf '  %b✓%b Git Hooks:     active (.rnex/hooks — post-merge auto-sync, %s)\n' "$_G" "$_NC" "$_active_trigger"
+        else
+          printf '  %b✓%b Git Hooks:     active (.rnex/hooks — post-merge auto-sync)\n' "$_G" "$_NC"
+        fi
+      else
+        printf '  %b○%b Git Hooks:     not configured (run "rnex hooks install" to enable)\n' "$_DIM" "$_NC"
+      fi
+      ;;
+  esac
   printf '\n'
 
   printf '%bWorkspace AI Context (Routing):%b\n' "$_BOLD" "$_NC"
@@ -1969,6 +2173,7 @@ cmd_fix() {
       _load_repos_dir
       _load_ai_instructions_file
       _load_code_workspace
+      _load_git_hooks
       [ "$_fix_quiet" -eq 0 ] && log_ok "Upgraded workspace configuration and routing instructions to v$RNEX_VERSION"
     fi
   fi
@@ -1985,15 +2190,41 @@ cmd_fix() {
   # 3. Sync standard prompts to .rnex/prompts/
   sync_prompts
 
-  # 4. If Git hooks are installed, ensure hook scripts are up to date
-  _cur_hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
-  if [ "$_cur_hp" = ".rnex/hooks" ] || [ "$_cur_hp" = "$NEXUS_DIR/.rnex/hooks" ]; then
-    _hooks_dir="$NEXUS_DIR/.rnex/hooks"
-    _create_hook_script "$_hooks_dir/post-merge" "post-merge"
-    _create_hook_script "$_hooks_dir/post-commit" "post-commit"
-    _create_hook_script "$_hooks_dir/pre-commit" "pre-commit"
-    _create_hook_script "$_hooks_dir/pre-push" "pre-push"
-  fi
+  # 4. Reconcile Git hooks according to configuration
+  case "$GIT_HOOKS_CONFIG" in
+    false|no|0)
+      _cur_hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
+      if [ "$_cur_hp" = ".rnex/hooks" ] || [ "$_cur_hp" = "$NEXUS_DIR/.rnex/hooks" ]; then
+        cmd_hooks_uninstall_dir "$NEXUS_DIR"
+      fi
+      ;;
+    true|yes|1)
+      if git -C "$NEXUS_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        _cur_hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
+        if [ "$_cur_hp" != ".rnex/hooks" ] && [ "$_cur_hp" != "$NEXUS_DIR/.rnex/hooks" ]; then
+          cmd_hooks_install_dir "$NEXUS_DIR"
+        elif [ "${_RNEX_INSIDE_HOOK:-0}" -ne 1 ]; then
+          _hooks_dir="$NEXUS_DIR/.rnex/hooks"
+          _create_hook_script "$_hooks_dir/post-merge" "post-merge"
+          _create_hook_script "$_hooks_dir/post-commit" "post-commit"
+          _create_hook_script "$_hooks_dir/pre-commit" "pre-commit"
+          _create_hook_script "$_hooks_dir/pre-push" "pre-push"
+        fi
+      fi
+      ;;
+    *)
+      _cur_hp="$(git -C "$NEXUS_DIR" config --get core.hooksPath 2>/dev/null || true)"
+      if [ "$_cur_hp" = ".rnex/hooks" ] || [ "$_cur_hp" = "$NEXUS_DIR/.rnex/hooks" ]; then
+        if [ "${_RNEX_INSIDE_HOOK:-0}" -ne 1 ]; then
+          _hooks_dir="$NEXUS_DIR/.rnex/hooks"
+          _create_hook_script "$_hooks_dir/post-merge" "post-merge"
+          _create_hook_script "$_hooks_dir/post-commit" "post-commit"
+          _create_hook_script "$_hooks_dir/pre-commit" "pre-commit"
+          _create_hook_script "$_hooks_dir/pre-push" "pre-push"
+        fi
+      fi
+      ;;
+  esac
 
   # 5. Reconcile plugins
   sync_plugins
@@ -2404,8 +2635,8 @@ cmd_help() {
     install [dir]           Install rnex & repo-nexus globally into ~/.local/bin (or custom dir)
     fix [-y] [--quiet]      Reconcile workspace, plugins, prompts & member .rnex/ (alias: sync)
     update [-y]             Upgrade workspace configuration and routing instructions (alias: upgrade)
-    hooks <install|uninstall|status>
-                            Manage config-driven automated Git hooks (.rnex/hooks)
+    hooks <install|uninstall|status> [--local]
+                            Manage automated Git hooks (--local writes to .local.rnex.yaml)
     completion <shell>      Generate shell completion script (bash, zsh, fish)
 
   REPO MANAGEMENT