repo-nexus 0.7.30 → 0.7.31

package/lib/commands/sync.sh

@@ -124,12 +124,7 @@ cmd_sync() {
         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-checkout" "post-checkout"
-          _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"
+          _install_managed_hook_scripts "$NEXUS_DIR/.rnex/hooks"
         fi
       fi
       ;;
@@ -137,12 +132,7 @@ cmd_sync() {
       _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-checkout" "post-checkout"
-          _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"
+          _install_managed_hook_scripts "$NEXUS_DIR/.rnex/hooks"
         fi
       fi
       ;;

package/lib/hooks.sh

@@ -4,13 +4,12 @@
 # lib/hooks.sh — Automated Git hooks management and event dispatch
 # ============================================================================
 
-# ---- Action Command Hook Dispatcher -----------------------------------------
+RNEX_MANAGED_GIT_HOOKS="post-merge post-checkout post-commit pre-commit pre-push"
 
-_run_hook_internal() {
-  _hook_target_plugin="$1"
-  _hook_phase_cmd="$2"
-  shift 2 2>/dev/null || true
+# ---- Shared Hook Resolution & Environment Helpers --------------------------
 
+# Resolve active workspace root for hook execution without mutating global state
+_resolve_hook_workspace() {
   _ws="${NEXUS_DIR:-}"
   if [ -z "$_ws" ]; then
     if [ -n "$CUSTOM_CONFIG" ]; then
@@ -24,13 +23,51 @@ _run_hook_internal() {
       _ws="$(find_workspace_dir 2>/dev/null || true)"
     fi
   fi
-  [ -z "$_ws" ] && return 0
+  [ -n "$_ws" ] || return 1
   _hook_root="$(cd "$_ws" 2>/dev/null && pwd -P)"
   _hook_config_merged="$_hook_root/rnex.yaml"
   if [ -n "$CUSTOM_CONFIG" ]; then
     _hook_config_merged="$(resolve_path "$CUSTOM_CONFIG" 2>/dev/null || true)"
   fi
-  [ ! -f "$_hook_config_merged" ] && return 0
+  [ -f "$_hook_config_merged" ] || return 1
+  return 0
+}
+
+# Locate a hook script for a plugin (checks scoped .rnex/plugins/<name>/hooks first,
+# then toolkit source directory). Accepts multiple candidate filenames in priority order.
+_resolve_plugin_hook_script() {
+  _rphs_root="$1"; _rphs_plugin="$2"
+  shift 2
+  _rphs_scoped="$_rphs_root/.rnex/plugins/$_rphs_plugin/hooks"
+  _rphs_src=""
+
+  for _cand_name in "$@"; do
+    if [ -f "$_rphs_scoped/$_cand_name" ]; then
+      printf '%s' "$_rphs_scoped/$_cand_name"
+      return 0
+    fi
+  done
+
+  _rphs_src="$(find_plugin_dir "$_rphs_plugin" 2>/dev/null || true)"
+  if [ -n "$_rphs_src" ]; then
+    for _cand_name in "$@"; do
+      if [ -f "$_rphs_src/hooks/$_cand_name" ]; then
+        printf '%s' "$_rphs_src/hooks/$_cand_name"
+        return 0
+      fi
+    done
+  fi
+  return 1
+}
+
+# ---- Action Command Hook Dispatcher -----------------------------------------
+
+_run_hook_internal() {
+  _hook_target_plugin="$1"
+  _hook_phase_cmd="$2"
+  shift 2 2>/dev/null || true
+
+  _resolve_hook_workspace || return 0
 
   _hook_cmd="${_hook_phase_cmd#*_}"
   _hook_file="${_hook_phase_cmd}.sh"
@@ -58,16 +95,13 @@ _run_hook_internal() {
     fi
 
     RNEX_PLUGIN_DIR="$_hook_root/.rnex/plugins/$_pname"
-    _hook_script="$RNEX_PLUGIN_DIR/hooks/$_hook_file"
-
-    if [ ! -f "$_hook_script" ]; then
-      _src_pdir="$(find_plugin_dir "$_pname" 2>/dev/null || true)"
-      if [ -n "$_src_pdir" ] && [ -f "$_src_pdir/hooks/$_hook_file" ]; then
-        _hook_script="$_src_pdir/hooks/$_hook_file"
-      fi
+    if [ "$_hook_phase_cmd" = "after_init" ]; then
+      _hook_script="$(_resolve_plugin_hook_script "$_hook_root" "$_pname" "after_init.sh" "after_sync.sh" || true)"
+    else
+      _hook_script="$(_resolve_plugin_hook_script "$_hook_root" "$_pname" "$_hook_file" || true)"
     fi
 
-    if [ -f "$_hook_script" ]; then
+    if [ -n "$_hook_script" ] && [ -f "$_hook_script" ]; then
       chmod +x "$_hook_script" 2>/dev/null || true
       (
         RNEX_ROOT="$_hook_root"
@@ -76,7 +110,7 @@ _run_hook_internal() {
         RNEX_ARGS="$_hook_args"
         RNEX_QUIET="$_hook_quiet"
         RNEX_PROVIDER_SKILL_DIRS="$_skill_dirs"
-        export RNEX_ROOT RNEX_CONFIG_MERGED RNEX_PLUGIN_DIR RNEX_CMD RNEX_ARGS RNEX_QUIET RNEX_PROVIDER_SKILL_DIRS
+        export RNEX_ROOT RNEX_CONFIG_MERGED RNEX_PLUGIN_DIR RNEX_CMD RNEX_ARGS RNEX_QUIET RNEX_PROVIDER_SKILL_DIRS RNEX_LIB_DIR
         set -- "$@"
         # shellcheck source=/dev/null
         . "$_hook_script"
@@ -106,8 +140,7 @@ run_plugin_git_hooks() {
   shift 2>/dev/null || true
 
   _ws="${NEXUS_DIR:-}"
-  [ -z "$_ws" ] && return 0
-  [ ! -f "$_ws/rnex.yaml" ] && return 0
+  [ -n "$_ws" ] && [ -f "$_ws/rnex.yaml" ] || return 0
 
   RNEX_ROOT="$(cd "$_ws" 2>/dev/null && pwd -P)"
   RNEX_CONFIG_MERGED="$RNEX_ROOT/rnex.yaml"
@@ -126,55 +159,26 @@ run_plugin_git_hooks() {
     yaml_plugin_enabled "$_pname" 2>/dev/null || continue
 
     RNEX_PLUGIN_DIR="$RNEX_ROOT/.rnex/plugins/$_pname"
-    _h_cand=""
-    if [ -f "$RNEX_PLUGIN_DIR/hooks/git_${_hook_name}.sh" ]; then
-      _h_cand="$RNEX_PLUGIN_DIR/hooks/git_${_hook_name}.sh"
-    elif [ -f "$RNEX_PLUGIN_DIR/hooks/${_hook_name}.sh" ]; then
-      _h_cand="$RNEX_PLUGIN_DIR/hooks/${_hook_name}.sh"
-    fi
-
-    if [ -z "$_h_cand" ]; then
-      _src_pdir="$(find_plugin_dir "$_pname" 2>/dev/null || true)"
-      if [ -n "$_src_pdir" ]; then
-        if [ -f "$_src_pdir/hooks/git_${_hook_name}.sh" ]; then
-          _h_cand="$_src_pdir/hooks/git_${_hook_name}.sh"
-        elif [ -f "$_src_pdir/hooks/${_hook_name}.sh" ]; then
-          _h_cand="$_src_pdir/hooks/${_hook_name}.sh"
-        fi
-      fi
-    fi
+    _h_cand="$(_resolve_plugin_hook_script "$RNEX_ROOT" "$_pname" "git_${_hook_name}.sh" "${_hook_name}.sh" || true)"
 
     if [ -n "$_h_cand" ] && [ -f "$_h_cand" ]; then
       chmod +x "$_h_cand" 2>/dev/null || true
       if [ -n "$_stdin_data" ]; then
-        printf '%s\n' "$_stdin_data" | env \
-          NEXUS_DIR="$RNEX_ROOT" \
-          WORKSPACE_YAML="$RNEX_ROOT/${RNEX_CONFIG_FILE:-rnex.yaml}" \
-          WORKSPACE_LOCAL_YAML="$RNEX_ROOT/${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
-          RNEX_ROOT="$RNEX_ROOT" \
-          RNEX_CONFIG_MERGED="$RNEX_CONFIG_MERGED" \
-          RNEX_PLUGIN_DIR="$RNEX_PLUGIN_DIR" \
-          RNEX_CMD="$RNEX_CMD" \
-          RNEX_ARGS="$RNEX_ARGS" \
-          RNEX_QUIET="$RNEX_QUIET" \
-          RNEX_CONFIG_FILE="${RNEX_CONFIG_FILE:-rnex.yaml}" \
-          RNEX_LOCAL_CONFIG_FILE="${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
-          "$_h_cand" "$@" || true
-      else
-        env \
-          NEXUS_DIR="$RNEX_ROOT" \
-          WORKSPACE_YAML="$RNEX_ROOT/${RNEX_CONFIG_FILE:-rnex.yaml}" \
-          WORKSPACE_LOCAL_YAML="$RNEX_ROOT/${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
-          RNEX_ROOT="$RNEX_ROOT" \
-          RNEX_CONFIG_MERGED="$RNEX_CONFIG_MERGED" \
-          RNEX_PLUGIN_DIR="$RNEX_PLUGIN_DIR" \
-          RNEX_CMD="$RNEX_CMD" \
-          RNEX_ARGS="$RNEX_ARGS" \
-          RNEX_QUIET="$RNEX_QUIET" \
-          RNEX_CONFIG_FILE="${RNEX_CONFIG_FILE:-rnex.yaml}" \
-          RNEX_LOCAL_CONFIG_FILE="${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
-          "$_h_cand" "$@" || true
-      fi
+        printf '%s\n' "$_stdin_data"
+      fi | env \
+        NEXUS_DIR="$RNEX_ROOT" \
+        WORKSPACE_YAML="$RNEX_ROOT/${RNEX_CONFIG_FILE:-rnex.yaml}" \
+        WORKSPACE_LOCAL_YAML="$RNEX_ROOT/${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
+        RNEX_ROOT="$RNEX_ROOT" \
+        RNEX_CONFIG_MERGED="$RNEX_CONFIG_MERGED" \
+        RNEX_PLUGIN_DIR="$RNEX_PLUGIN_DIR" \
+        RNEX_CMD="$RNEX_CMD" \
+        RNEX_ARGS="$RNEX_ARGS" \
+        RNEX_QUIET="$RNEX_QUIET" \
+        RNEX_LIB_DIR="${RNEX_LIB_DIR:-}" \
+        RNEX_CONFIG_FILE="${RNEX_CONFIG_FILE:-rnex.yaml}" \
+        RNEX_LOCAL_CONFIG_FILE="${RNEX_LOCAL_CONFIG_FILE:-.local.rnex.yaml}" \
+        "$_h_cand" "$@" || true
     fi
   done
 }
@@ -216,19 +220,20 @@ HOOK_EOF
   mv "$_sub_tmp" "$_dst"
 }
 
+_install_managed_hook_scripts() {
+  _imh_dir="$1"
+  mkdir -p "$_imh_dir"
+  for _h in $RNEX_MANAGED_GIT_HOOKS; do
+    _create_hook_script "$_imh_dir/$_h" "$_h"
+  done
+}
+
 cmd_hooks_install_dir() {
   _ws_dir="$1"
   if ! git -C "$_ws_dir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
     die "Directory '$_ws_dir' is not a Git repository. Run 'git init' first."
   fi
-  _h_dir="$_ws_dir/.rnex/hooks"
-  mkdir -p "$_h_dir"
-  _create_hook_script "$_h_dir/post-merge" "post-merge"
-  _create_hook_script "$_h_dir/post-checkout" "post-checkout"
-  _create_hook_script "$_h_dir/post-commit" "post-commit"
-  _create_hook_script "$_h_dir/pre-commit" "pre-commit"
-  _create_hook_script "$_h_dir/pre-push" "pre-push"
-
+  _install_managed_hook_scripts "$_ws_dir/.rnex/hooks"
   git -C "$_ws_dir" config core.hooksPath .rnex/hooks
   log_ok "Configured Git hooks in .rnex/hooks (core.hooksPath = .rnex/hooks)"
 }
@@ -242,9 +247,71 @@ cmd_hooks_uninstall_dir() {
   log_ok "Uninstalled Repo Nexus Git hooks (core.hooksPath unset)"
 }
 
+# Re-sync workspace if sync_stamp is stale or config files changed in git diff
+_sync_if_hook_config_changed() {
+  _shc_hook="$1"
+  shift || true
+  _cfg_changed=0
+  _stamp_file=""
+  if [ -f "$NEXUS_DIR/.rnex/sync_stamp" ]; then
+    _stamp_file="$NEXUS_DIR/.rnex/sync_stamp"
+  elif [ -f "$NEXUS_DIR/.rnex/.sync_stamp" ]; then
+    _stamp_file="$NEXUS_DIR/.rnex/.sync_stamp"
+  fi
+
+  if [ -z "$_stamp_file" ] || [ "$(get_config_sum "$NEXUS_DIR")" != "$(cat "$_stamp_file" 2>/dev/null)" ]; then
+    _cfg_changed=1
+  else
+    case "$_shc_hook" in
+      post-merge)
+        git -C "$NEXUS_DIR" diff-tree -r --name-only ORIG_HEAD HEAD 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)" && _cfg_changed=1
+        ;;
+      post-checkout)
+        [ -n "${1:-}" ] && [ -n "${2:-}" ] && git -C "$NEXUS_DIR" diff-tree -r --name-only "$1" "$2" 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)" && _cfg_changed=1
+        ;;
+      pre-commit)
+        git -C "$NEXUS_DIR" diff --cached --name-only 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)" && _cfg_changed=1
+        ;;
+    esac
+  fi
+
+  if [ "$_cfg_changed" -eq 1 ]; then
+    cmd_sync -y --quiet || true
+  fi
+}
+
+# Delegate to repository-owned hook in scripts/githooks/<hook> or .githooks/<hook>
+_delegate_repo_githook() {
+  _drg_hook="$1"; _drg_non_blocking="$2"; _drg_stdin="$3"
+  shift 3 || true
+
+  _drg_script=""
+  if [ -x "$NEXUS_DIR/scripts/githooks/$_drg_hook" ]; then
+    _drg_script="$NEXUS_DIR/scripts/githooks/$_drg_hook"
+  elif [ -x "$NEXUS_DIR/.githooks/$_drg_hook" ]; then
+    _drg_script="$NEXUS_DIR/.githooks/$_drg_hook"
+  fi
+  [ -n "$_drg_script" ] || return 0
+
+  if [ -n "$_drg_stdin" ]; then
+    if [ "$_drg_non_blocking" -eq 1 ]; then
+      printf '%s\n' "$_drg_stdin" | "$_drg_script" "$@" || true
+    else
+      printf '%s\n' "$_drg_stdin" | "$_drg_script" "$@" || return $?
+    fi
+  else
+    if [ "$_drg_non_blocking" -eq 1 ]; then
+      "$_drg_script" "$@" || true
+    else
+      "$_drg_script" "$@" || return $?
+    fi
+  fi
+}
+
 cmd_hooks() {
   case "${1:-status}" in
-    install)
+    install|uninstall)
+      _h_action="$1"
       require_workspace
       _local=0
       shift || true
@@ -254,33 +321,19 @@ cmd_hooks() {
         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"
+      if [ "$_h_action" = "install" ]; then
+        cmd_hooks_install_dir "$NEXUS_DIR"
+        _gh_val="true"
       else
-        yaml_set_top_level "git_hooks" "true"
-        log_dim "Recorded git_hooks: true in $RNEX_CONFIG_FILE"
+        cmd_hooks_uninstall_dir "$NEXUS_DIR"
+        _gh_val="false"
       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"
+        yaml_set_top_level_local "git_hooks" "$_gh_val"
+        log_dim "Recorded git_hooks: $_gh_val in $RNEX_LOCAL_CONFIG_FILE"
       else
-        yaml_set_top_level "git_hooks" "false"
-        log_dim "Recorded git_hooks: false in $RNEX_CONFIG_FILE"
+        yaml_set_top_level "git_hooks" "$_gh_val"
+        log_dim "Recorded git_hooks: $_gh_val in $RNEX_CONFIG_FILE"
       fi
       _load_git_hooks
       ;;
@@ -307,7 +360,7 @@ cmd_hooks() {
       fi
 
       printf '\n%bInstalled Hooks in .rnex/hooks/:%b\n' "$_BOLD" "$_NC"
-      for _h in "post-merge" "post-checkout" "post-commit" "pre-commit" "pre-push"; do
+      for _h in $RNEX_MANAGED_GIT_HOOKS; do
         if [ -f "$NEXUS_DIR/.rnex/hooks/$_h" ]; then
           printf '  %b✓%b %-15s %b(installed)%b\n' "$_G" "$_NC" "$_h" "$_DIM" "$_NC"
         else
@@ -343,86 +396,19 @@ cmd_hooks() {
       export _RNEX_INSIDE_HOOK=1
       require_workspace
       case "$_hook_name" in
-        post-merge)
-          _cfg_changed=0
-          _stamp_file=""
-          if [ -f "$NEXUS_DIR/.rnex/sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/sync_stamp"
-          elif [ -f "$NEXUS_DIR/.rnex/.sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/.sync_stamp"
-          fi
-          if [ -z "$_stamp_file" ] || [ "$(get_config_sum "$NEXUS_DIR")" != "$(cat "$_stamp_file" 2>/dev/null)" ]; then
-            _cfg_changed=1
-          elif git -C "$NEXUS_DIR" diff-tree -r --name-only ORIG_HEAD HEAD 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)"; then
-            _cfg_changed=1
-          fi
-          if [ "$_cfg_changed" -eq 1 ]; then
-            cmd_sync -y --quiet || true
-          fi
-          run_plugin_git_hooks "post-merge" "$@"
-          if [ -x "$NEXUS_DIR/scripts/githooks/post-merge" ]; then
-            "$NEXUS_DIR/scripts/githooks/post-merge" "$@" || true
-          elif [ -x "$NEXUS_DIR/.githooks/post-merge" ]; then
-            "$NEXUS_DIR/.githooks/post-merge" "$@" || true
-          fi
-          return 0
-          ;;
-        post-checkout)
-          _cfg_changed=0
-          _stamp_file=""
-          if [ -f "$NEXUS_DIR/.rnex/sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/sync_stamp"
-          elif [ -f "$NEXUS_DIR/.rnex/.sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/.sync_stamp"
-          fi
-          if [ -z "$_stamp_file" ] || [ "$(get_config_sum "$NEXUS_DIR")" != "$(cat "$_stamp_file" 2>/dev/null)" ]; then
-            _cfg_changed=1
-          elif [ -n "$1" ] && [ -n "$2" ] && git -C "$NEXUS_DIR" diff-tree -r --name-only "$1" "$2" 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)"; then
-            _cfg_changed=1
-          fi
-          if [ "$_cfg_changed" -eq 1 ]; then
-            cmd_sync -y --quiet || true
-          fi
-          run_plugin_git_hooks "post-checkout" "$@"
-          if [ -x "$NEXUS_DIR/scripts/githooks/post-checkout" ]; then
-            "$NEXUS_DIR/scripts/githooks/post-checkout" "$@" || true
-          elif [ -x "$NEXUS_DIR/.githooks/post-checkout" ]; then
-            "$NEXUS_DIR/.githooks/post-checkout" "$@" || true
-          fi
-          return 0
+        post-merge|post-checkout)
+          _sync_if_hook_config_changed "$_hook_name" "$@"
+          run_plugin_git_hooks "$_hook_name" "$@"
+          _delegate_repo_githook "$_hook_name" 1 "" "$@"
           ;;
         post-commit)
           run_plugin_git_hooks "post-commit" "$@"
-          if [ -x "$NEXUS_DIR/scripts/githooks/post-commit" ]; then
-            "$NEXUS_DIR/scripts/githooks/post-commit" "$@" || true
-          elif [ -x "$NEXUS_DIR/.githooks/post-commit" ]; then
-            "$NEXUS_DIR/.githooks/post-commit" "$@" || true
-          fi
-          return 0
+          _delegate_repo_githook "post-commit" 1 "" "$@"
           ;;
         pre-commit)
-          _cfg_changed=0
-          _stamp_file=""
-          if [ -f "$NEXUS_DIR/.rnex/sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/sync_stamp"
-          elif [ -f "$NEXUS_DIR/.rnex/.sync_stamp" ]; then
-            _stamp_file="$NEXUS_DIR/.rnex/.sync_stamp"
-          fi
-          if [ -z "$_stamp_file" ] || [ "$(get_config_sum "$NEXUS_DIR")" != "$(cat "$_stamp_file" 2>/dev/null)" ]; then
-            _cfg_changed=1
-          elif git -C "$NEXUS_DIR" diff --cached --name-only 2>/dev/null | grep -qE "(^rnex\.yaml$|^\.local\.rnex\.yaml$)"; then
-            _cfg_changed=1
-          fi
-          if [ "$_cfg_changed" -eq 1 ]; then
-            cmd_sync -y --quiet || true
-          fi
+          _sync_if_hook_config_changed "pre-commit" "$@"
           run_plugin_git_hooks "pre-commit" "$@"
-          if [ -x "$NEXUS_DIR/scripts/githooks/pre-commit" ]; then
-            "$NEXUS_DIR/scripts/githooks/pre-commit" "$@" || return $?
-          elif [ -x "$NEXUS_DIR/.githooks/pre-commit" ]; then
-            "$NEXUS_DIR/.githooks/pre-commit" "$@" || return $?
-          fi
-          return 0
+          _delegate_repo_githook "pre-commit" 0 "" "$@" || return $?
           ;;
         pre-push)
           _stdin_data=""
@@ -434,20 +420,7 @@ cmd_hooks() {
           else
             run_plugin_git_hooks "pre-push" "$@"
           fi
-          if [ -x "$NEXUS_DIR/scripts/githooks/pre-push" ]; then
-            if [ -n "$_stdin_data" ]; then
-              printf '%s\n' "$_stdin_data" | "$NEXUS_DIR/scripts/githooks/pre-push" "$@" || return $?
-            else
-              "$NEXUS_DIR/scripts/githooks/pre-push" "$@" || return $?
-            fi
-          elif [ -x "$NEXUS_DIR/.githooks/pre-push" ]; then
-            if [ -n "$_stdin_data" ]; then
-              printf '%s\n' "$_stdin_data" | "$NEXUS_DIR/.githooks/pre-push" "$@" || return $?
-            else
-              "$NEXUS_DIR/.githooks/pre-push" "$@" || return $?
-            fi
-          fi
-          return 0
+          _delegate_repo_githook "pre-push" 0 "$_stdin_data" "$@" || return $?
           ;;
       esac
       return 0

package/lib/plugins.sh

@@ -131,7 +131,7 @@ plugin_resolve_placeholders() {
       fi
       case "$_k" in
         *_dir|dir)
-          _v="$(printf '%s' "$_v" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -d "'\"" | sed -e 's#^\./##' -e 's#^/##' -e 's#/$##')"
+          _v="$(normalize_rel_path "$_v")"
           ;;
       esac
       _res="$(printf '%s' "$_res" | sed -e "s|{$_k}|$_v|g")"
@@ -140,8 +140,8 @@ plugin_resolve_placeholders() {
 
   # Fallback resolution for core wiki/raw placeholders and legacy prefixes
   _w_val="$(yaml_plugin_get "$_p" "wiki_dir" 2>/dev/null || true)"
-  [ -z "$_w_val" ] && _w_val=".rnex/wiki"
-  _w_val="$(printf '%s' "$_w_val" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -d "'\"" | sed -e 's#^\./##' -e 's#^/##' -e 's#/$##')"
+  [ -n "$_w_val" ] || _w_val=".rnex/wiki"
+  _w_val="$(normalize_rel_path "$_w_val")"
 
   # {raw_dir} (legacy alias) resolves to the first explicit directory source; when no
   # directory source exists it stays unresolved so callers can skip the destination.
@@ -178,6 +178,33 @@ plugin_instantiate_template() {
       "$_src" > "$_dest"
 }
 
+# Deterministically sync plugin asset directories and manifest files into destination
+sync_plugin_bundle() {
+  _spb_src="$1"; _spb_dest="$2"
+  [ -n "$_spb_src" ] && [ -n "$_spb_dest" ] || return 0
+  [ "$_spb_src" != "$_spb_dest" ] || return 0
+
+  mkdir -p "$_spb_dest"
+  rm -rf "${_spb_dest:?}/prompts" 2>/dev/null || true
+  for _sub in rules workflows instructions skills agents templates hooks; do
+    if [ -d "$_spb_src/$_sub" ]; then
+      rm -rf "${_spb_dest:?}/$_sub"
+      mkdir -p "$_spb_dest/$_sub"
+      cp -R "$_spb_src/$_sub"/. "$_spb_dest/$_sub"/ 2>/dev/null || true
+      if [ "$_sub" = "hooks" ]; then
+        chmod +x "$_spb_dest/hooks"/* 2>/dev/null || true
+      fi
+    else
+      rm -rf "${_spb_dest:?}/$_sub"
+    fi
+  done
+  for _meta in plugin.yaml instructions.md README.md; do
+    if [ -f "$_spb_src/$_meta" ]; then
+      cp "$_spb_src/$_meta" "$_spb_dest/$_meta"
+    fi
+  done
+}
+
 # Sync plugins into scoped directories: .rnex/plugins/<plugin-name>/
 sync_plugins() {
   # Clean up any bogus placeholder directories accidentally created in workspace root
@@ -286,36 +313,7 @@ sync_plugins() {
       continue
     fi
 
-    _scoped_dest="$NEXUS_DIR/.rnex/plugins/$_pname"
-    if [ "$_pdir" != "$_scoped_dest" ]; then
-      mkdir -p "$_scoped_dest"
-
-      # Deterministically sync plugin asset directories (clean stale files; no prompts in plugins)
-      rm -rf "${_scoped_dest:?}/prompts" 2>/dev/null || true
-      for _sub in rules workflows instructions skills agents templates hooks; do
-        if [ -d "$_pdir/$_sub" ]; then
-          rm -rf "${_scoped_dest:?}/$_sub"
-          mkdir -p "$_scoped_dest/$_sub"
-          cp -R "$_pdir/$_sub"/. "$_scoped_dest/$_sub"/ 2>/dev/null || true
-          if [ "$_sub" = "hooks" ]; then
-            chmod +x "$_scoped_dest/hooks"/* 2>/dev/null || true
-          fi
-        else
-          rm -rf "${_scoped_dest:?}/$_sub"
-        fi
-      done
-
-      # Copy plugin manifest, instructions, and documentation
-      if [ -f "$_pdir/plugin.yaml" ]; then
-        cp "$_pdir/plugin.yaml" "$_scoped_dest/plugin.yaml"
-      fi
-      if [ -f "$_pdir/instructions.md" ]; then
-        cp "$_pdir/instructions.md" "$_scoped_dest/instructions.md"
-      fi
-      if [ -f "$_pdir/README.md" ]; then
-        cp "$_pdir/README.md" "$_scoped_dest/README.md"
-      fi
-    fi
+    sync_plugin_bundle "$_pdir" "$NEXUS_DIR/.rnex/plugins/$_pname"
 
     # Provision explicit directory sources declared under plugins.<name>.sources (e.g. ./docs)
     for _sdir in $(plugin_source_dirs "$_pname" 2>/dev/null); do

package/lib/repos.sh

@@ -27,13 +27,7 @@ ensure_repos_dir() {
 # ---- Member Repo .rnex Isolation ------------------------------------------
 
 repo_rnex_dir_enabled() {
-  _name="$1"
-  _val="$(yaml_get "$_name" "rnex_dir")"
-  _val="$(printf '%s' "$_val" | tr '[:upper:]' '[:lower:]')"
-  case "$_val" in
-    false|no|0|disabled|off) return 1 ;;
-    *) return 0 ;;
-  esac
+  is_enabled_val "$(yaml_get "$1" "rnex_dir")"
 }
 
 clean_repo_rnex() {
@@ -105,31 +99,6 @@ EOF
     _pdir="$(find_plugin_dir "$_pname" 2>/dev/null || true)"
     [ -n "$_pdir" ] || continue
 
-    _dest_pdir="$_r_rnex/plugins/$_pname"
-    mkdir -p "$_dest_pdir"
-
-    # Deterministically sync plugin asset directories into member repo (no prompts in plugins)
-    rm -rf "${_dest_pdir:?}/prompts" 2>/dev/null || true
-    for _sub in rules workflows instructions skills agents templates hooks; do
-      if [ -d "$_pdir/$_sub" ]; then
-        rm -rf "${_dest_pdir:?}/$_sub"
-        mkdir -p "$_dest_pdir/$_sub"
-        cp -R "$_pdir/$_sub"/. "$_dest_pdir/$_sub"/ 2>/dev/null || true
-        if [ "$_sub" = "hooks" ]; then
-          chmod +x "$_dest_pdir/hooks"/* 2>/dev/null || true
-        fi
-      else
-        rm -rf "${_dest_pdir:?}/$_sub"
-      fi
-    done
-    if [ -f "$_pdir/plugin.yaml" ]; then
-      cp "$_pdir/plugin.yaml" "$_dest_pdir/plugin.yaml"
-    fi
-    if [ -f "$_pdir/instructions.md" ]; then
-      cp "$_pdir/instructions.md" "$_dest_pdir/instructions.md"
-    fi
-    if [ -f "$_pdir/README.md" ]; then
-      cp "$_pdir/README.md" "$_dest_pdir/README.md"
-    fi
+    sync_plugin_bundle "$_pdir" "$_r_rnex/plugins/$_pname"
   done
 }

package/package.json

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

package/toolkit/plugins/claude/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/claude/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/claude/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi

package/toolkit/plugins/copilot/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/copilot/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/copilot/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi

package/toolkit/plugins/cursor/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/cursor/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/cursor/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi

package/toolkit/plugins/gemini/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/gemini/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/gemini/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi

package/toolkit/plugins/karpathy-llm/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/karpathy-llm/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/karpathy-llm/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi

package/toolkit/plugins/windsurf/hooks/after_init.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-_hook_dir=""
-if [ -n "${RNEX_PLUGIN_DIR:-}" ] && [ -f "$RNEX_PLUGIN_DIR/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_PLUGIN_DIR/hooks"
-elif [ -n "${RNEX_ROOT:-}" ] && [ -f "$RNEX_ROOT/toolkit/plugins/windsurf/hooks/after_sync.sh" ]; then
-  _hook_dir="$RNEX_ROOT/toolkit/plugins/windsurf/hooks"
-elif [ -f "$(dirname "$0")/after_sync.sh" ]; then
-  _hook_dir="$(cd "$(dirname "$0")" && pwd -P)"
-fi
-
-if [ -n "$_hook_dir" ] && [ -f "$_hook_dir/after_sync.sh" ]; then
-  . "$_hook_dir/after_sync.sh"
-fi