claude-pangu 2.3.1 → 2.3.3

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://code.claude.com/plugin-schema.json",
   "name": "oh-my-claude",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "hooks": "../hooks/hooks.json",
   "description": "基于中国传统文化的 Claude Code 智能编排插件 - A Claude Code plugin inspired by Chinese traditional culture",
   "author": "ZDragon17",

package/README.md

@@ -920,6 +920,8 @@ model: sonnet
 - [x] v2.2.22 - **Hook 系统根本性修复** 🔧（stdin JSON 读取、PostToolUse 崩溃修复、WSL 符号链接保护）
 - [x] v2.3.0 - **oh-my-opencode v3.8.4 全面移植** 🚀（9 Agent 重写 + 6 新 Hook + 5 命令更新 + 4 技能升级）
 - [x] v2.3.1 - **Hook 注册修复** 🐛（syncHooksToSettings 完善 Wave 2 Hook 注册，新增 4 测试用例）
+- [x] v2.3.2 - **Hook 无 jq 回退修复** 🐛（4 个 Hook 的 Windows/无 jq 环境兼容性修复）
+- [x] v2.3.3 - **Hook 逻辑修复** 🐛（json-error-recovery 模式排序 + write-existing-file-guard 路径排除修复）
 
 ### v2.2.2 核心更新
 

package/hooks/category-skill-reminder.sh

@@ -32,7 +32,11 @@ if command -v jq > /dev/null 2>&1; then
     TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // empty' 2>/dev/null) || TOOL_INPUT=""
 else
     TOOL_NAME=$(echo "$INPUT" | grep -o '"tool_name"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"tool_name"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || TOOL_NAME=""
-    TOOL_INPUT=""
+    # 无 jq 时从 INPUT 原文提取文件路径用于路径排除
+    TOOL_INPUT=$(echo "$INPUT" | grep -o '"filePath"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"filePath"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || TOOL_INPUT=""
+    if [ -z "$TOOL_INPUT" ]; then
+        TOOL_INPUT=$(echo "$INPUT" | grep -o '"file_path"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"file_path"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || TOOL_INPUT=""
+    fi
 fi
 
 # 只关注直接实现类工具（非探索/读取类）

package/hooks/comment-checker.sh

@@ -41,6 +41,17 @@ CONTENT=""
 if command -v jq > /dev/null 2>&1; then
     # Write 工具: content 字段; Edit 工具: new_text/newString 字段
     CONTENT=$(echo "$INPUT" | jq -r '(.tool_input.content // .tool_input.new_text // .tool_input.newString // .tool_input.text // empty)' 2>/dev/null) || CONTENT=""
+else
+    # 无 jq 时从 JSON 原文提取 content/text 字段
+    CONTENT=$(echo "$INPUT" | grep -o '"content"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"content"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || CONTENT=""
+    if [ -z "$CONTENT" ]; then
+        CONTENT=$(echo "$INPUT" | grep -o '"new_text"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"new_text"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || CONTENT=""
+    fi
+    if [ -z "$CONTENT" ]; then
+        CONTENT=$(echo "$INPUT" | grep -o '"text"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"text"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/' 2>/dev/null) || CONTENT=""
+    fi
+    # 将 JSON 转义的 \\n 还原为真实换行
+    CONTENT=$(printf '%b' "$CONTENT" 2>/dev/null) || true
 fi
 
 # 没有内容可检查

package/hooks/json-error-recovery.sh

@@ -47,7 +47,7 @@ detect_json_parse_error() {
     local output="$1"
     
     # 模式1: 标准 JSON 解析错误
-    if echo "$output" | grep -qiE '(JSON\.parse|SyntaxError.*JSON|Unexpected token|JSON parse error|invalid json|json.*syntax)'; then
+    if echo "$output" | grep -qiE '(JSON\.parse|SyntaxError.*JSON|Unexpected token|JSON parse error|invalid json|json.*syntax|trailing comma|duplicate key)'; then
         return 0
     fi
     
@@ -67,27 +67,23 @@ detect_json_parse_error() {
 # 检测具体的 JSON 错误类型
 detect_specific_error() {
     local output="$1"
-    
-    if echo "$output" | grep -qiE 'Unexpected token.*position|at column'; then
-        echo "POSITION"
-        return
-    fi
-    
+    # STRING 检查必须在 POSITION 之前（POSITION 的 'at (column|position)' 会误匹配 STRING 类错误）
     if echo "$output" | grep -qiE 'Unterminated string|unclosed.*string'; then
         echo "STRING"
         return
     fi
-    
     if echo "$output" | grep -qiE 'trailing comma|Expected.*}.*got.*,'; then
         echo "TRAILING_COMMA"
         return
     fi
-    
+    if echo "$output" | grep -qiE 'Unexpected token.*position|at (column|position)|position [0-9]'; then
+        echo "POSITION"
+        return
+    fi
     if echo "$output" | grep -qiE 'Unexpected end|unexpected eof|incomplete'; then
         echo "INCOMPLETE"
         return
     fi
-    
     echo "GENERIC"
 }
 

package/hooks/todo-continuation-enforcer.sh

@@ -61,11 +61,11 @@ if command -v jq > /dev/null 2>&1; then
     # 获取未完成任务描述
     PENDING_TASKS=$(jq -r '[.todos // [] | .[] | select(.status == "pending" or .status == "in_progress") | .content] | join("\n  - ")' "$TODO_FILE" 2>/dev/null) || PENDING_TASKS=""
 else
-    # 无 jq 时使用 grep 粗略统计
-    TOTAL_COUNT=$(grep -c '"status"' "$TODO_FILE" 2>/dev/null) || TOTAL_COUNT=0
-    PENDING_COUNT=$(grep -c '"pending"' "$TODO_FILE" 2>/dev/null) || PENDING_COUNT=0
-    IN_PROGRESS_COUNT=$(grep -c '"in_progress"' "$TODO_FILE" 2>/dev/null) || IN_PROGRESS_COUNT=0
-    COMPLETED_COUNT=$(grep -c '"completed"' "$TODO_FILE" 2>/dev/null) || COMPLETED_COUNT=0
+    # 无 jq 时使用 grep -o 统计出现次数（而非 grep -c 统计行数，避免单行 JSON 计数错误）
+    TOTAL_COUNT=$(grep -o '"status"' "$TODO_FILE" 2>/dev/null | wc -l | tr -d ' ') || TOTAL_COUNT=0
+    PENDING_COUNT=$(grep -o '"pending"' "$TODO_FILE" 2>/dev/null | wc -l | tr -d ' ') || PENDING_COUNT=0
+    IN_PROGRESS_COUNT=$(grep -o '"in_progress"' "$TODO_FILE" 2>/dev/null | wc -l | tr -d ' ') || IN_PROGRESS_COUNT=0
+    COMPLETED_COUNT=$(grep -o '"completed"' "$TODO_FILE" 2>/dev/null | wc -l | tr -d ' ') || COMPLETED_COUNT=0
 fi
 
 # 计算未完成总数

package/hooks/write-existing-file-guard.sh

@@ -78,7 +78,7 @@ fi
 
 # 允许对特定目录的文件覆写（内部管理文件）
 case "$FILE_PATH" in
-    */.claude/*|*/oh-my-claude/*|*/.oh-my-claude/*|*/.sisyphus/*)
+    */.claude/*|*/.oh-my-claude/*|*/.sisyphus/*)
         exit 0
         ;;
 esac

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-pangu",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "基于中国传统文化的 Claude Code 智能编排插件 - A Claude Code plugin inspired by Chinese traditional culture (原名 oh-my-claude)",
   "keywords": [
     "claude-code",