@moneko/core 4.12.2 → 4.12.3

package/hooks/ai-eslint.sh

@@ -1,66 +1,102 @@
 #!/usr/bin/env bash
+#
+# Shared AI Agent ESLint fix Stop hook.
+# Used by both Claude Code (project .claude/settings.json) and Codex
+# (project .codex/config.toml). Runs the project's own `npx mo eslint <file> --fix`
+# over the files the Agent just created/modified/untracked, then blocks the
+# Agent Stop until the remaining ESLint errors are fixed.
+#
+# Exit codes:
+#   0  no target files, or all errors were auto-fixed
+#   2  at least one file still has ESLint errors after --fix (blocks Stop)
 set -u
 
+# ---------------------------------------------------------------------------
+# Recursion guard. Both Claude Code and Codex pass a JSON payload on stdin for
+# Stop hooks. When a Stop hook blocks (exit 2), the platform starts a follow-up
+# turn and sets `stop_hook_active` to true in that payload. We must not block
+# again on the follow-up turn, otherwise the Agent loops forever.
+# ---------------------------------------------------------------------------
 if [ ! -t 0 ]; then
-  hook_input=$(cat)
-  if printf '%s' "$hook_input" | grep -Eq '"stop_hook_active"[[:space:]]*:[[:space:]]*true'; then
-    exit 0
-  fi
+  hook_input="$(cat 2>/dev/null || true)"
+  case "$hook_input" in
+    *'"stop_hook_active"':*'true'*) exit 0 ;;
+  esac
 fi
 
-repo_root=$(git rev-parse --show-toplevel 2>/dev/null) || {
-  printf 'AI ESLint hook: unable to locate the Git repository root.\n' >&2
-  exit 2
-}
-
-cd "$repo_root" || exit 2
+# Locate the repository root so this works from any subdirectory.
+root="$(git rev-parse --show-toplevel 2>/dev/null)" || exit 0
+cd "$root" || exit 0
 
 if ! command -v npx >/dev/null 2>&1; then
-  printf 'AI ESLint hook: npx is unavailable; install no dependency automatically and fix the environment before continuing.\n' >&2
+  printf '%s\n' 'AI ESLint stop hook: npx is unavailable; install the existing project dependencies before retrying. No dependency was installed.' >&2
   exit 2
 fi
 
-tmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/ai-eslint-fix.XXXXXX") || exit 2
-trap 'rm -rf "$tmp_dir"' EXIT
-
-had_errors=0
-
-while IFS= read -r -d '' record; do
-  xy=${record:0:2}
-  path=${record:3}
+if ! npx --no-install mo --version >/dev/null 2>&1; then
+  printf '%s\n' 'AI ESLint stop hook: project command "mo" is unavailable; install the existing project dependencies before retrying. No dependency was installed.' >&2
+  exit 2
+fi
 
-  case "$xy" in
-    *R*|*C*)
-      # Rename/copy records contain a second NUL-delimited path. Always consume it.
-      IFS= read -r -d '' ignored_path || true
-      ;;
-  esac
+# ---------------------------------------------------------------------------
+# Collect target files from NUL-separated porcelain v1 output. This keeps
+# spaces / CJK / other characters intact and correctly consumes the second
+# NUL-terminated path of rename/copy records.
+# ---------------------------------------------------------------------------
+targets=()
+while IFS= read -r -d '' entry; do
+  x="${entry:0:1}"   # index status: ' ', M, A, D, R, C, U, ?
+  y="${entry:1:1}"   # worktree status: ' ', M, D, U, ?
+  path="${entry:3}"  # skip the "XY " prefix and preserve the full path
 
-  case "$xy" in
-    \?\?) should_lint=1 ;;
-    *)
-      case "$xy" in
-        *A*|*M*) should_lint=1 ;;
-        *) should_lint=0 ;;
-      esac
-      ;;
-  esac
+  # Rename (R) / copy (C) records carry a second NUL-terminated source path.
+  # Consume it so the next status record is not misaligned.
+  if [ "$x" = R ] || [ "$x" = C ]; then
+    IFS= read -r -d '' _src || true
+  fi
 
-  [ "$should_lint" -eq 1 ] || continue
-  [ -e "$path" ] || [ -L "$path" ] || continue
+  # Deleted files are never processed.
+  if [ "$x" = D ] || [ "$y" = D ]; then
+    continue
+  fi
 
-  output_file="$tmp_dir/output-${RANDOM}-${RANDOM}"
-  if ! npx mo eslint "$path" --fix >"$output_file" 2>&1; then
-    had_errors=1
+  # Pure rename/copy (no added or modified content) is not processed.
+  if { [ "$x" = R ] || [ "$x" = C ]; } && [ "$y" != M ]; then
+    continue
   fi
-  if [ -s "$output_file" ]; then
-    cat "$output_file" >&2
+
+  # Process: modified (staged or working-tree), added, or untracked.
+  if [ "$x" = M ] || [ "$y" = M ] || [ "$x" = A ] || { [ "$x" = '?' ] && [ "$y" = '?' ]; }; then
+    targets+=("$path")
   fi
 done < <(git status --porcelain=v1 -z --untracked-files=all)
 
-if [ "$had_errors" -ne 0 ]; then
-  printf '\nAI ESLint hook: 请 Agent 继续修复剩余 ESLint 问题。\n' >&2
+# ---------------------------------------------------------------------------
+# Run the project's own linter one file at a time. A failed file must not stop
+# the remaining files; collect all output and report it once at the end.
+# ---------------------------------------------------------------------------
+failed=0
+collected=""
+for file in "${targets[@]:-}"; do
+  # Skip paths that no longer exist on disk.
+  [ -e "$file" ] || continue
+
+  out="$(npx mo eslint "$file" --fix 2>&1)"
+  rc=$?
+  if [ "$rc" -ne 0 ]; then
+    failed=1
+    collected+="${out}"$'\n'
+  fi
+done
+
+if [ "$failed" -ne 0 ]; then
+  {
+    [ -n "$collected" ] && printf '%s\n' "$collected"
+    printf '%s\n' '============================================================'
+    printf '%s\n' 'AI ESLint stop hook: 以上文件在 --fix 后仍存在 ESLint error。'
+    printf '%s\n' '请继续修复剩余的 ESLint 问题后再结束当前任务。'
+  } >&2
   exit 2
 fi
 
-exit 0
+exit 0

package/hooks/ai-stylelint.sh

@@ -20,9 +20,10 @@ if ! command -v npx >/dev/null 2>&1; then
   exit 2
 fi
 
-if ! npx mo stylelint src; then
+output=$(npx mo stylelint src 2>&1) || {
+  printf '%s\n' "$output" >&2
   printf '\nAI Stylelint hook: 请 Agent 继续修复剩余 Stylelint 问题。\n' >&2
   exit 2
-fi
+}
 
 exit 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/core",
-  "version": "4.12.2",
+  "version": "4.12.3",
   "description": "@moneko/core",
   "main": "lib/index.mjs",
   "type": "module",