oh-my-customcode 1.1.67 → 1.1.68

package/dist/cli/index.js

@@ -217,7 +217,7 @@ var init_package = __esm(() => {
     workspaces: [
       "packages/*"
     ],
-    version: "1.1.67",
+    version: "1.1.68",
     description: "Batteries-included agent harness for Claude Code",
     type: "module",
     bin: {

package/dist/index.js

@@ -2326,7 +2326,7 @@ var package_default = {
   workspaces: [
     "packages/*"
   ],
-  version: "1.1.67",
+  version: "1.1.68",
   description: "Batteries-included agent harness for Claude Code",
   type: "module",
   bin: {

package/package.json

@@ -3,7 +3,7 @@
   "workspaces": [
     "packages/*"
   ],
-  "version": "1.1.67",
+  "version": "1.1.68",
   "description": "Batteries-included agent harness for Claude Code",
   "type": "module",
   "bin": {

package/templates/.claude/hooks/scripts/r007-r008-drift-advisor.sh

@@ -298,6 +298,10 @@ split("\n")
     # 미announce Read — 은 새로 발화한다(의도된 동작, v1.1.62 적대적 리뷰 재현 C1/C2).
     | ($an_tool + (if $an_spawn > $an_tool_agent then $an_spawn - $an_tool_agent else 0 end)) as $announce
     | ([ $blocks[] | select((.type? == "tool_use") and ((.name? // "") != "Skill")) ] | length) as $ntools
+    # 미접두 도구 이름 (#1687): $ntools와 동일한 필터(non-Skill tool_use)로 순서를 보존한 이름
+    # 목록을 뽑는다. $r008(누락 건수)이 어떤 도구인지 shell에서 드러내기 위한 부가 필드 —
+    # 판정식($r008 산출) 자체는 건드리지 않는다.
+    | ([ $blocks[] | select((.type? == "tool_use") and ((.name? // "") != "Skill")) | (.name? // "") ]) as $tool_names_list
     # 전체 tool_use(Skill 포함)가 0건인 턴은 forward 판정을 무조건 0으로 고정한다(#1625
     # 찐빠 #3, 이슈 제안 그대로). $ntools(Skill 제외) 기반 산식은 정상 입력에서는 이미
     # 0을 내지만, 명시 가드로 불변식을 코드에 못박아 향후 산식 변경이 이 보장을 조용히
@@ -322,7 +326,7 @@ split("\n")
     | ([ $lines[] | select(test("^\\[[^\\]]+\\]\\[[^\\]]+\\] ?(→|->|—>) ?Tool:")) ] | length) as $an_anchored
     # $nall_tools는 위 forward r008 가드에서 이미 바인딩됨 — 재바인딩하지 않고 재사용한다.
     | (if $nall_tools == 0 and $an_anchored > 0 then $an_anchored else 0 end) as $r008rev
-    | [$tuuid, ($r007 | tostring), ($r008 | tostring), ($r008rev | tostring)] | @tsv
+    | [$tuuid, ($r007 | tostring), ($r008 | tostring), ($r008rev | tostring), ($tool_names_list | join(","))] | @tsv
       )
       end
   end
@@ -346,6 +350,8 @@ turn_uuid=$(printf '%s' "$result" | cut -f1)
 r007_violations=$(printf '%s' "$result" | cut -f2)
 r008_violations=$(printf '%s' "$result" | cut -f3)
 r008_reverse=$(printf '%s' "$result" | cut -f4)
+# 미접두 도구 이름 목록 (#1687) — $ntools와 동일 필터의 순서 보존 목록, "," join.
+tool_names=$(printf '%s' "$result" | cut -f5)
 
 : "${r007_violations:=0}"
 : "${r008_violations:=0}"
@@ -397,6 +403,26 @@ if [ "$r008_violations" -gt 0 ]; then
     violation_desc="R008 도구 식별 접두사 누락 ${r008_violations}건"
     instruction="모든 도구 호출에 [agent][model] → Tool: 접두사를 포함하십시오."
   fi
+  # 미접두 도구 이름 귀속 (#1687): announce는 턴 단위로 매칭되므로, $tool_names(순서 보존,
+  # non-Skill tool_use)의 마지막 r008_violations개를 부족분으로 귀속한다. 카운트 문구
+  # "R008 도구 식별 접두사 누락 N건"은 위에서 이미 확정되어 바이트 동일 유지 — 이 접미사는
+  # 항상 그 뒤에 이어붙인다(scripts/count-r007-r008.sh의 grep -oE 앵커와 무관).
+  if [ -n "$tool_names" ]; then
+    r008_missing_tools=$(printf '%s' "$tool_names" | awk -F',' -v n="$r008_violations" '{
+      total = NF
+      start = total - n + 1
+      if (start < 1) start = 1
+      out = ""
+      for (i = start; i <= total; i++) {
+        if (out != "") out = out ", "
+        out = out $i
+      }
+      print out
+    }')
+    if [ -n "$r008_missing_tools" ]; then
+      violation_desc="${violation_desc} (미접두 도구: ${r008_missing_tools})"
+    fi
+  fi
 fi
 
 if [ -n "$violation_desc" ]; then

package/templates/.claude/hooks/scripts/stuck-detector.sh

@@ -597,13 +597,34 @@ raw_command=$(printf '%s' "$input" | jq -r '.tool_input.command // ""')
 # Distinguish "the same file edited 3 times with DIFFERENT content" (a normal
 # incremental-edit workflow — the #1641 false positive) from "the same edit
 # repeated 3 times" (a genuine stuck loop). Only the latter should hard-block.
-# Alphanumerics-only + length cap: deterministic, platform-independent (no
-# md5sum, absent on macOS) and safe to embed in a grep pattern.
+# #1649: the original alphanumerics-only + 120-char-cut key had two defects —
+# (M-1) edits differing only in punctuation/whitespace (e.g. re-aligning a
+# markdown table) collapsed to the SAME key and were falsely blocked as
+# "identical", and (M-2) Write calls sharing a long identical prefix (e.g.
+# frontmatter) collided after the 120-char cut even when the body differed.
+# New spec: collapse whitespace runs to one space (still deterministic,
+# platform-independent, no md5sum) but PRESERVE punctuation, then key on
+# "<len>#<full>" when the normalized string is <=120 chars (short strings fit
+# whole, so no sum is needed), else "<len>#<codepoint sum>#<first 80 chars>
+# #<last 40 chars>" — length + codepoint sum + head/tail. Adversarial review
+# found the length+head+tail-only key (no sum) still collides when a
+# same-length middle-only substitution falls entirely outside both the head
+# and tail windows (e.g. this repo's own count/version-bump Writes: 80 "A"s +
+# "version-115-count" + 40 "Z"s vs "...-116-..." vs "...-117-..." — all 137
+# chars, identical head/tail). The codepoint sum changes whenever the changed
+# substring's characters change, so a substitution is now caught by the sum;
+# a same-sum transposition of the middle segment can still collide — an
+# accepted residual risk, not fully eliminated.
 edit_hash=""
 if [ "$tool_name" = "Edit" ] || [ "$tool_name" = "Write" ]; then
   edit_hash=$(printf '%s' "$input" \
     | jq -r '(.tool_input.old_string // .tool_input.content // .tool_input.new_string // "")
-             | gsub("[^A-Za-z0-9]"; "") | .[0:120]')
+             | gsub("[[:space:]]+"; " ") | ltrimstr(" ") | rtrimstr(" ")
+             | (length as $l
+                | if $l <= 120 then "\($l)#\(.)"
+                  else ((explode | add // 0) as $sum
+                        | "\($l)#\($sum)#\(.[0:80])#\(.[-40:])")
+                  end)')
 fi
 
 # History entries are written by jq, so their "path" values are JSON-ENCODED.
@@ -615,6 +636,15 @@ fi
 target_key_json=$(jq -n --arg v "$target_key" '$v')
 path_match="\"path\":${target_key_json}"
 
+# #1649 follow-up: edit_hash now preserves punctuation (see the edit_hash
+# comment above), so it can contain quotes/backslashes just like a Bash
+# command can. It is written to history the same JSON-encoded way "path" is
+# (--arg ehash "$edit_hash" -> jq serializes it), so Check 1 / Check 3 below
+# must match it with the SAME JSON-encoded literal, not the raw string — same
+# fix as path_match above, applied to edit_hash.
+edit_hash_json=$(jq -n --arg v "$edit_hash" '$v')
+edit_hash_match="\"edit_hash\":${edit_hash_json}"
+
 is_readonly="false"
 if [ "$tool_name" = "Bash" ]; then
   is_readonly=$(is_readonly_bash_command "$raw_command")
@@ -761,7 +791,7 @@ if [ -f "$HISTORY_FILE" ]; then
     if [ "$is_readonly" != "true" ] && [ -n "$file_path" ]; then
       consecutive_file=$(printf '%s\n' "$last_n" \
         | grep -F -e "$path_match" \
-        | grep -cF -e "\"edit_hash\":\"${edit_hash}\"" 2>/dev/null || true)
+        | grep -cF -e "$edit_hash_match" 2>/dev/null || true)
       [ -n "$consecutive_file" ] || consecutive_file=0
       if [ "$consecutive_file" -ge "$HARD_BLOCK_THRESHOLD" ]; then
         hard_block=true
@@ -791,7 +821,7 @@ if [ -f "$HISTORY_FILE" ]; then
       consecutive_tool_target=$(printf '%s\n' "$last_n" \
         | grep -F -e "\"tool\":\"${tool_name}\"" \
         | grep -F -e "$path_match" \
-        | grep -cF -e "\"edit_hash\":\"${edit_hash}\"" 2>/dev/null || true)
+        | grep -cF -e "$edit_hash_match" 2>/dev/null || true)
       [ -n "$consecutive_tool_target" ] || consecutive_tool_target=0
       if [ "$consecutive_tool_target" -ge "$HARD_BLOCK_THRESHOLD" ]; then
         hard_block=true

package/templates/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.67",
+  "version": "1.1.68",
   "lastUpdated": "2026-09-03",
   "omcustomMinClaudeCode": "2.1.121",
   "omcustomMinClaudeCodeReason": "Sensitive-path direct Write/Edit on .claude/** under bypassPermissions (R010 deprecation, #1101)",