oh-my-customcode 2.0.0 → 2.0.2

package/README.md

@@ -296,7 +296,7 @@ your-project/
 
 ## External Tool Integrations
 
-Starting with v2.0.0, project RTK integration is retired: the public `/rtk-exec` skill, automatic installation, doctor integration, and RTK hooks are removed. Separately installed RTK binaries remain on your machine. Updates automatically remove retired managed files only when their hashes match the previous lockfile. Modified files and files with unknown ownership are preserved and reported as conflicts; retained user skill files may still be discovered automatically. Other tools are optional:
+Starting with v1.1.107, project RTK integration is retired: the public `/rtk-exec` skill, automatic installation, doctor integration, and RTK hooks are removed. Separately installed RTK binaries remain on your machine. Updates automatically remove retired managed files only when their hashes match the previous lockfile. Modified files and files with unknown ownership are preserved and reported as conflicts; retained user skill files may still be discovered automatically. Other tools are optional:
 
 | Tool | Purpose | Install | Status |
 |------|---------|---------|--------|

package/dist/cli/index.js

@@ -335,7 +335,7 @@ var init_package = __esm(() => {
     workspaces: [
       "packages/*"
     ],
-    version: "2.0.0",
+    version: "2.0.2",
     description: "Batteries-included agent harness for Claude Code",
     type: "module",
     bin: {
@@ -15800,7 +15800,7 @@ var MESSAGES = {
     "update.file_applied": "Applied update to {{path}}",
     "update.lockfile_regenerated": "Lockfile regenerated ({{files}} files tracked)",
     "update.lockfile_failed": "Failed to regenerate lockfile: {{error}}",
-    "update.protected_file_updated": "⟳ Protected file {{file}} in {{component}} updated: {{hint}}",
+    "update.protected_file_updated": "⟳ Protected file {{file}} in {{component}} selected for update: The protected-file policy allows this template update.",
     "update.namespace_synced": "Namespace synced: {{file}} ({{component}})",
     "update.hook_commands_migrated": "Migrated {{count}} hook/statusLine command(s) to CLAUDE_PROJECT_DIR-anchored paths",
     "update.hook_commands_migration_failed": "Failed to migrate hook commands in {{path}}",
@@ -15836,8 +15836,8 @@ var MESSAGES = {
     "update.entry_doc_force_updated": "Entry document force-updated: {{path}}",
     "update.entry_merge_warning": "Entry document merge warning: {{warning}}",
     "update.entry_template_not_found": "Entry document template not found: {{template}}",
-    "update.protected_file_force_overwrite": "Protected file {{file}} in {{component}} overwritten: {{hint}}",
-    "update.protected_file_skipped": "Protected file {{file}} in {{component}} skipped: {{hint}}",
+    "update.protected_file_force_overwrite": "Protected file {{file}} in {{component}} selected for overwrite: The --force-overwrite-all option bypasses the protected-file preservation policy.",
+    "update.protected_file_skipped": "Protected file {{file}} in {{component}} skipped: The protected-file preservation policy skips this update. Use --force-overwrite-all to override.",
     "update.settings_local_backfill_failed": "Failed to backfill statusLine refreshInterval in {{path}}",
     "general.done": "Done!",
     "general.failed": "Failed",
@@ -15913,7 +15913,7 @@ var MESSAGES = {
     "update.file_applied": "{{path}} 업데이트 적용",
     "update.lockfile_regenerated": "잠금 파일 재생성 완료 ({{files}}개 파일 추적)",
     "update.lockfile_failed": "잠금 파일 재생성 실패: {{error}}",
-    "update.protected_file_updated": "⟳ 보호 파일 {{file}} ({{component}}) 업데이트됨: {{hint}}",
+    "update.protected_file_updated": "⟳ 보호 파일 {{file}} ({{component}}) 업데이트 대상: 보호 파일 정책에 따라 템플릿 업데이트가 허용됩니다.",
     "update.namespace_synced": "네임스페이스 동기화: {{file}} ({{component}})",
     "update.hook_commands_migrated": "CLAUDE_PROJECT_DIR 기준 경로로 훅/상태줄 명령 {{count}}개를 마이그레이션했습니다",
     "update.hook_commands_migration_failed": "{{path}}의 훅 명령 마이그레이션에 실패했습니다",
@@ -15949,8 +15949,8 @@ var MESSAGES = {
     "update.entry_doc_force_updated": "진입 문서를 강제로 업데이트했습니다: {{path}}",
     "update.entry_merge_warning": "진입 문서 병합 경고: {{warning}}",
     "update.entry_template_not_found": "진입 문서 템플릿을 찾을 수 없습니다: {{template}}",
-    "update.protected_file_force_overwrite": "{{component}}의 보호 파일 {{file}}을(를) 덮어썼습니다: {{hint}}",
-    "update.protected_file_skipped": "{{component}}의 보호 파일 {{file}}을(를) 건너뜁니다: {{hint}}",
+    "update.protected_file_force_overwrite": "{{component}}의 보호 파일 {{file}} 덮어쓰기 대상: --force-overwrite-all 옵션에 따라 보호 파일 보존 정책을 적용하지 않습니다.",
+    "update.protected_file_skipped": "{{component}}의 보호 파일 {{file}}을(를) 건너뜁니다: 보호 파일 보존 정책에 따라 업데이트를 건너뜁니다. 덮어쓰려면 --force-overwrite-all 옵션을 사용하십시오.",
     "update.settings_local_backfill_failed": "{{path}}의 statusLine refreshInterval 보충에 실패했습니다",
     "general.done": "완료!",
     "general.failed": "실패",
@@ -22135,6 +22135,29 @@ async function runFullUpdatePostProcessing(options, result, config, customizatio
     });
   }
 }
+async function getUpdateVersionDecision(installedVersion, cliVersion) {
+  if (!(installedVersion !== "0.0.0" && compareSemver2(installedVersion, cliVersion) > 0)) {
+    return "standard";
+  }
+  if (installedVersion !== "2.0.0") {
+    return "blocked";
+  }
+  const match = /^1\.1\.(0|[1-9]\d*)$/.exec(cliVersion);
+  if (!match) {
+    return "blocked";
+  }
+  const patch = Number(match[1]);
+  if (!Number.isSafeInteger(patch) || patch < 107) {
+    return "blocked";
+  }
+  const manifestPath = resolveTemplatePath(getProviderLayout().manifestFile);
+  if (!await fileExists(manifestPath)) {
+    return "blocked";
+  }
+  const manifest = await readJsonFile(manifestPath);
+  const correctionAllowed = typeof manifest === "object" && manifest !== null && !Array.isArray(manifest) && "version" in manifest && manifest.version === cliVersion;
+  return correctionAllowed ? "correction" : "blocked";
+}
 function compareSemver2(a, b) {
   const pa = a.split(".").map(Number);
   const pb = b.split(".").map(Number);
@@ -22195,7 +22218,8 @@ async function update(options) {
     const config = await loadConfig(options.targetDir);
     result.previousVersion = config.version;
     const cliVersion = package_default.version;
-    if (result.previousVersion !== "0.0.0" && compareSemver2(result.previousVersion, cliVersion) > 0) {
+    const versionDecision = await getUpdateVersionDecision(result.previousVersion, cliVersion);
+    if (versionDecision === "blocked") {
       result.success = false;
       result.error = `Downgrade prevented: project has v${result.previousVersion} but CLI is v${cliVersion}. Update the CLI first: npm install -g oh-my-customcode@latest`;
       return result;
@@ -22204,6 +22228,11 @@ async function update(options) {
       return result;
     }
     const updateCheck = await checkForUpdates(options.targetDir);
+    if (versionDecision === "correction" && updateCheck.latestVersion !== cliVersion) {
+      result.success = false;
+      result.error = `Version correction prevented: CLI is v${cliVersion} but templates are v${updateCheck.latestVersion}. Reinstall the CLI: npm install -g oh-my-customcode@latest`;
+      return result;
+    }
     result.newVersion = updateCheck.latestVersion;
     if (!updateCheck.hasUpdates && !options.force) {
       info("update.no_updates");
@@ -22377,22 +22406,19 @@ async function updateComponent(targetDir, component, customizations, options, co
     if (options.forceOverwriteAll) {
       warn("update.protected_file_force_overwrite", {
         file: protectedPath,
-        component,
-        hint: "File contains AI behavioral constraints. Overwriting because --force-overwrite-all was set."
+        component
       });
     } else {
       warn("update.protected_file_skipped", {
         file: protectedPath,
-        component,
-        hint: "File was modified by user and preserved. Use --force-overwrite-all to override."
+        component
       });
     }
   }
   for (const updatedPath of protectedUpdatedPaths) {
     info("update.protected_file_updated", {
       file: updatedPath,
-      component,
-      hint: "Protected file updated (unmodified by user, matches lockfile hash)."
+      component
     });
   }
   skipPaths.push(...protectedSkipPaths);

package/dist/index.js

@@ -416,7 +416,7 @@ var MESSAGES = {
     "update.file_applied": "Applied update to {{path}}",
     "update.lockfile_regenerated": "Lockfile regenerated ({{files}} files tracked)",
     "update.lockfile_failed": "Failed to regenerate lockfile: {{error}}",
-    "update.protected_file_updated": "⟳ Protected file {{file}} in {{component}} updated: {{hint}}",
+    "update.protected_file_updated": "⟳ Protected file {{file}} in {{component}} selected for update: The protected-file policy allows this template update.",
     "update.namespace_synced": "Namespace synced: {{file}} ({{component}})",
     "update.hook_commands_migrated": "Migrated {{count}} hook/statusLine command(s) to CLAUDE_PROJECT_DIR-anchored paths",
     "update.hook_commands_migration_failed": "Failed to migrate hook commands in {{path}}",
@@ -452,8 +452,8 @@ var MESSAGES = {
     "update.entry_doc_force_updated": "Entry document force-updated: {{path}}",
     "update.entry_merge_warning": "Entry document merge warning: {{warning}}",
     "update.entry_template_not_found": "Entry document template not found: {{template}}",
-    "update.protected_file_force_overwrite": "Protected file {{file}} in {{component}} overwritten: {{hint}}",
-    "update.protected_file_skipped": "Protected file {{file}} in {{component}} skipped: {{hint}}",
+    "update.protected_file_force_overwrite": "Protected file {{file}} in {{component}} selected for overwrite: The --force-overwrite-all option bypasses the protected-file preservation policy.",
+    "update.protected_file_skipped": "Protected file {{file}} in {{component}} skipped: The protected-file preservation policy skips this update. Use --force-overwrite-all to override.",
     "update.settings_local_backfill_failed": "Failed to backfill statusLine refreshInterval in {{path}}",
     "general.done": "Done!",
     "general.failed": "Failed",
@@ -529,7 +529,7 @@ var MESSAGES = {
     "update.file_applied": "{{path}} 업데이트 적용",
     "update.lockfile_regenerated": "잠금 파일 재생성 완료 ({{files}}개 파일 추적)",
     "update.lockfile_failed": "잠금 파일 재생성 실패: {{error}}",
-    "update.protected_file_updated": "⟳ 보호 파일 {{file}} ({{component}}) 업데이트됨: {{hint}}",
+    "update.protected_file_updated": "⟳ 보호 파일 {{file}} ({{component}}) 업데이트 대상: 보호 파일 정책에 따라 템플릿 업데이트가 허용됩니다.",
     "update.namespace_synced": "네임스페이스 동기화: {{file}} ({{component}})",
     "update.hook_commands_migrated": "CLAUDE_PROJECT_DIR 기준 경로로 훅/상태줄 명령 {{count}}개를 마이그레이션했습니다",
     "update.hook_commands_migration_failed": "{{path}}의 훅 명령 마이그레이션에 실패했습니다",
@@ -565,8 +565,8 @@ var MESSAGES = {
     "update.entry_doc_force_updated": "진입 문서를 강제로 업데이트했습니다: {{path}}",
     "update.entry_merge_warning": "진입 문서 병합 경고: {{warning}}",
     "update.entry_template_not_found": "진입 문서 템플릿을 찾을 수 없습니다: {{template}}",
-    "update.protected_file_force_overwrite": "{{component}}의 보호 파일 {{file}}을(를) 덮어썼습니다: {{hint}}",
-    "update.protected_file_skipped": "{{component}}의 보호 파일 {{file}}을(를) 건너뜁니다: {{hint}}",
+    "update.protected_file_force_overwrite": "{{component}}의 보호 파일 {{file}} 덮어쓰기 대상: --force-overwrite-all 옵션에 따라 보호 파일 보존 정책을 적용하지 않습니다.",
+    "update.protected_file_skipped": "{{component}}의 보호 파일 {{file}}을(를) 건너뜁니다: 보호 파일 보존 정책에 따라 업데이트를 건너뜁니다. 덮어쓰려면 --force-overwrite-all 옵션을 사용하십시오.",
     "update.settings_local_backfill_failed": "{{path}}의 statusLine refreshInterval 보충에 실패했습니다",
     "general.done": "완료!",
     "general.failed": "실패",
@@ -2906,7 +2906,7 @@ var package_default = {
   workspaces: [
     "packages/*"
   ],
-  version: "2.0.0",
+  version: "2.0.2",
   description: "Batteries-included agent harness for Claude Code",
   type: "module",
   bin: {
@@ -5901,6 +5901,29 @@ async function runFullUpdatePostProcessing(options, result, config, customizatio
     });
   }
 }
+async function getUpdateVersionDecision(installedVersion, cliVersion) {
+  if (!(installedVersion !== "0.0.0" && compareSemver(installedVersion, cliVersion) > 0)) {
+    return "standard";
+  }
+  if (installedVersion !== "2.0.0") {
+    return "blocked";
+  }
+  const match = /^1\.1\.(0|[1-9]\d*)$/.exec(cliVersion);
+  if (!match) {
+    return "blocked";
+  }
+  const patch = Number(match[1]);
+  if (!Number.isSafeInteger(patch) || patch < 107) {
+    return "blocked";
+  }
+  const manifestPath = resolveTemplatePath(getProviderLayout().manifestFile);
+  if (!await fileExists(manifestPath)) {
+    return "blocked";
+  }
+  const manifest = await readJsonFile(manifestPath);
+  const correctionAllowed = typeof manifest === "object" && manifest !== null && !Array.isArray(manifest) && "version" in manifest && manifest.version === cliVersion;
+  return correctionAllowed ? "correction" : "blocked";
+}
 function compareSemver(a, b) {
   const pa = a.split(".").map(Number);
   const pb = b.split(".").map(Number);
@@ -5961,7 +5984,8 @@ async function update(options) {
     const config = await loadConfig(options.targetDir);
     result.previousVersion = config.version;
     const cliVersion = package_default.version;
-    if (result.previousVersion !== "0.0.0" && compareSemver(result.previousVersion, cliVersion) > 0) {
+    const versionDecision = await getUpdateVersionDecision(result.previousVersion, cliVersion);
+    if (versionDecision === "blocked") {
       result.success = false;
       result.error = `Downgrade prevented: project has v${result.previousVersion} but CLI is v${cliVersion}. Update the CLI first: npm install -g oh-my-customcode@latest`;
       return result;
@@ -5970,6 +5994,11 @@ async function update(options) {
       return result;
     }
     const updateCheck = await checkForUpdates(options.targetDir);
+    if (versionDecision === "correction" && updateCheck.latestVersion !== cliVersion) {
+      result.success = false;
+      result.error = `Version correction prevented: CLI is v${cliVersion} but templates are v${updateCheck.latestVersion}. Reinstall the CLI: npm install -g oh-my-customcode@latest`;
+      return result;
+    }
     result.newVersion = updateCheck.latestVersion;
     if (!updateCheck.hasUpdates && !options.force) {
       info("update.no_updates");
@@ -6164,22 +6193,19 @@ async function updateComponent(targetDir, component, customizations, options, co
     if (options.forceOverwriteAll) {
       warn("update.protected_file_force_overwrite", {
         file: protectedPath,
-        component,
-        hint: "File contains AI behavioral constraints. Overwriting because --force-overwrite-all was set."
+        component
       });
     } else {
       warn("update.protected_file_skipped", {
         file: protectedPath,
-        component,
-        hint: "File was modified by user and preserved. Use --force-overwrite-all to override."
+        component
       });
     }
   }
   for (const updatedPath of protectedUpdatedPaths) {
     info("update.protected_file_updated", {
       file: updatedPath,
-      component,
-      hint: "Protected file updated (unmodified by user, matches lockfile hash)."
+      component
     });
   }
   skipPaths.push(...protectedSkipPaths);

package/package.json

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

package/templates/.claude/hooks/scripts/claude-md-reinject.sh

@@ -38,7 +38,13 @@ fi
 
 source_field=$(printf '%s' "$input" | jq -r '.source // "unknown"' 2>/dev/null) || source_field="unknown"
 
-# #1770: honor CLAUDE_PROJECT_DIR first; fallback git toplevel (or pwd), not script location.
+# #1770 / B-L1: nonempty CLAUDE_PROJECT_DIR selects the anchor. When manually
+# running inside a Git monorepo package, set it to that package to select its
+# CLAUDE.md; unset/empty instead selects the Git toplevel, then pwd if Git fails.
+# The script location is never the fallback project anchor.
+# B-L2: a nonempty invalid anchor is authoritative; there is no Git/cwd retry.
+# If its CLAUDE.md is missing (including a missing directory or a file anchor),
+# the file check below returns silently with exit 0, preserving advisory behavior.
 PROJECT_ROOT="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}"
 CLAUDE_MD="$PROJECT_ROOT/CLAUDE.md"
 

package/templates/.claude/hooks/scripts/session-reflection.sh

@@ -29,22 +29,67 @@ if ! command -v jq >/dev/null 2>&1; then
   exit 0
 fi
 
-# ── session_id 추출 ──
-session_id=$(printf '%s\n' "$input" | jq -r '.session_id // empty' 2>/dev/null)
+# ── 부모 필드 추출: 한 jq 생산자, 독립 오류 fallback 유지 ──
+# jq -j는 session_id의 원래 raw/pretty 출력을 유지한다. 문자열의 실제 NUL만
+# 제거하여 필드 구분자와 충돌하지 않게 하고, 각 필드의 끝 LF는 기존 command
+# substitution처럼 제거한다. JSON 문자열 안의 escaped NUL은 그대로 유지한다.
+# slurp 후에도 입력별 출력 순서와 오류 전 부분 출력 + fallback을 유지한다.
+# process substitution의 jq 실패를 잃지 않도록 별도 종료 상태 필드를 보낸다.
+parent_fields=()
+while IFS= read -r -d '' parent_field; do
+  parent_fields[${#parent_fields[@]}]="$parent_field"
+done < <(
+  if printf '%s\n' "$input" | jq -sj '
+    . as $inputs
+    | [try ($inputs[] | .background_tasks // [] | tojson) catch "[]"] as $bg
+    | [try ($inputs[] | .session_crons // [] | tojson) catch "[]"] as $crons
+    | [try ($bg[] | fromjson | length) catch 0] as $bg_count
+    | [try ($crons[] | fromjson | length) catch 0] as $cron_count
+    | [try ($bg[] | fromjson
+        | [.[] | select(.status? == "running" or .status? == "pending" or .status? == "in_progress")]
+        | length) catch 0] as $dangling
+    | ($inputs[] | .session_id // empty
+        | if type == "string" then gsub("\u0000"; "") else . end
+        | (., "\n")),
+      "\u0000",
+      ($bg | join("\n")), "\u0000",
+      ($crons | join("\n")), "\u0000",
+      ($bg_count | map(tostring) | join("\n")), "\u0000",
+      ($cron_count | map(tostring) | join("\n")), "\u0000",
+      ($dangling | map(tostring) | join("\n")), "\u0000"
+  ' 2>/dev/null; then
+    parent_status=0
+  else
+    parent_status=$?
+  fi
+  # An extra separator terminates partial last fields from a failed producer.
+  printf '\0%s\0' "$parent_status"
+)
+parent_status="${parent_fields[${#parent_fields[@]}-1]}"
+if [ "$parent_status" -ne 0 ]; then
+  exit "$parent_status"
+fi
+if [ "${#parent_fields[@]}" -ne 8 ] || [ -n "${parent_fields[6]}" ]; then
+  exit 1
+fi
+for parent_index in 0 1 2 3 4 5; do
+  while [[ "${parent_fields[$parent_index]}" == *$'\n' ]]; do
+    parent_fields[$parent_index]="${parent_fields[$parent_index]%$'\n'}"
+  done
+done
+session_id="${parent_fields[0]}"
 if [ -z "$session_id" ]; then
   printf '%s\n' "$input"
   exit 0
 fi
 
-# ── Phase 2 (#1196): background_tasks / session_crons 추출 (CC v2.1.145+) ──
-# 신규 필드 미존재 시 빈 배열로 처리 (graceful degrade).
-bg_tasks_json=$(printf '%s\n' "$input" | jq -c '.background_tasks // []' 2>/dev/null || echo '[]')
-session_crons_json=$(printf '%s\n' "$input" | jq -c '.session_crons // []' 2>/dev/null || echo '[]')
-bg_tasks_count=$(printf '%s\n' "$bg_tasks_json" | jq 'length' 2>/dev/null || echo 0)
-session_crons_count=$(printf '%s\n' "$session_crons_json" | jq 'length' 2>/dev/null || echo 0)
-
-# 미완료 백그라운드 태스크: running/pending/in_progress 상태 카운트
-bg_dangling_count=$(printf '%s\n' "$bg_tasks_json" | jq '[.[] | select(.status? == "running" or .status? == "pending" or .status? == "in_progress")] | length' 2>/dev/null || echo 0)
+# ── Phase 2 (#1196): background_tasks / session_crons (CC v2.1.145+) ──
+# Missing/null/false fields retain [], and each count retains its own fallback.
+bg_tasks_json="${parent_fields[1]}"
+session_crons_json="${parent_fields[2]}"
+bg_tasks_count="${parent_fields[3]}"
+session_crons_count="${parent_fields[4]}"
+bg_dangling_count="${parent_fields[5]}"
 
 # ── 경로 결정 (환경변수 override 지원) ──
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -239,7 +284,8 @@ WORKER_EOF
 chmod +x "$WORKER_SCRIPT"
 
 # ── 백그라운드로 실행 (Stop hook 시간 예산 <3s 준수) ──
-# setsid로 부모 종료 후에도 실행 지속; 완료 후 임시 파일 자정리
+# 전체 subshell의 표준 입출력을 분리하여 부모의 파이프를 붙들지 않는다.
+# 분석은 비동기이며 완료 후 임시 파일을 제거한다. setsid/session 생존 보장은 없다.
 WORKER_ERR_LOG="/tmp/.claude-reflection-err-${PPID}.log"
 
 (
@@ -250,10 +296,9 @@ WORKER_ERR_LOG="/tmp/.claude-reflection-err-${PPID}.log"
     "$SCRIPT_DIR" \
     "$bg_tasks_json" \
     "$session_crons_json" \
-    "$bg_dangling_count" \
-    2>>"$WORKER_ERR_LOG"
+    "$bg_dangling_count"
   rm -f "$WORKER_SCRIPT"
-) &
+) </dev/null >/dev/null 2>>"$WORKER_ERR_LOG" &
 disown $! 2>/dev/null || true
 
 # ── 즉시 stdin pass-through 후 exit 0 (Stop hook 체인 유지) ──

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

@@ -536,8 +536,92 @@ input=$(cat)
 # Swallow it instead: exit 0 with no stdout, exactly as if the hook had not
 # run. "jq -e" exits non-zero both for a parse error and for a false/null
 # result, so one guard covers every non-object shape.
-printf '%s' "$input" | jq -e 'type == "object"' >/dev/null 2>&1 || exit 0
+# Common string fields can share one jq producer. Unusual types and embedded
+# NUL retain the original extraction path: command substitution has platform-
+# specific NUL handling, and independent jq failures are part of the contract.
+extraction_mode=$(printf '%s' "$input" | jq -er '
+  if type != "object" then false
+  elif any(.. | strings; contains("\u0000")) then "legacy"
+  elif ((.tool_name // "unknown" | type) != "string") then "legacy"
+  elif ((.tool_input != null) and ((.tool_input | type) != "object")) then "legacy"
+  elif ((.tool_output != null) and ((.tool_output | type) != "object")) then "legacy"
+  elif ((.tool_input.file_path // "" | type) != "string")
+    or ((.tool_input.command // "" | type) != "string")
+    or ((.tool_input.old_string // .tool_input.content // .tool_input.new_string // "" | type) != "string")
+  then "legacy" else "batched" end
+' 2>/dev/null) || exit 0
+
+# NUL-delimited fields are safe only after the guard above excludes embedded
+# NUL. A final producer-status record makes jq failures observable; process
+# substitution alone would discard its exit status. jq -j preserves -r scalar
+# rendering without an added newline; trim actual trailing LF just as $(...) did.
+_read_stuck_fields() {
+  local filter="$1" field status
+  STUCK_FIELDS=()
+  while IFS= read -r -d '' field; do
+    while [[ "$field" == *$'\n' ]]; do field="${field%$'\n'}"; done
+    STUCK_FIELDS[${#STUCK_FIELDS[@]}]="$field"
+  done < <(
+    if printf '%s' "$input" | jq -j "$filter"; then
+      printf '%s\0' '__OMCUSTOM_JQ_STATUS__0'
+    else
+      printf '__OMCUSTOM_JQ_STATUS__%s\0' "$?"
+    fi
+  )
+  status="${STUCK_FIELDS[${#STUCK_FIELDS[@]}-1]:-}"
+  case "$status" in
+    __OMCUSTOM_JQ_STATUS__*) status="${status#__OMCUSTOM_JQ_STATUS__}" ;;
+    *) return 1 ;;
+  esac
+  unset "STUCK_FIELDS[$((${#STUCK_FIELDS[@]} - 1))]"
+  return "$status"
+}
+
+TARGET_KEY_CAP=1000
+
+truncate_key() {
+  local v="$1"
+  if [ "${#v}" -gt "$TARGET_KEY_CAP" ]; then
+    printf '%s' "${v:0:$TARGET_KEY_CAP}#len=${#v}"
+  else
+    printf '%s' "$v"
+  fi
+}
 
+# Batched extraction changes no classifier or detector inputs. Preview retains
+# its original byte-cap pipeline, including broken-pipe tolerance.
+if [ "$extraction_mode" = "batched" ]; then
+  _read_stuck_fields '(.tool_name // "unknown"), "\u0000",
+    (if (.tool_name // "unknown") == "Bash"
+      then (.tool_input.command // .tool_input.file_path // "")
+      else (.tool_input.file_path // "") end), "\u0000",
+    (.tool_output.is_error // false), "\u0000"'
+  [ "${#STUCK_FIELDS[@]}" -eq 3 ] || exit 1
+  tool_name="${STUCK_FIELDS[0]}"
+  if [ "$tool_name" = "Bash" ]; then
+    file_path=""
+    target_key=$(truncate_key "${STUCK_FIELDS[1]}")
+  else
+    file_path_full="${STUCK_FIELDS[1]}"
+    file_path=$(printf '%s' "$file_path_full" | head -c "$TARGET_KEY_CAP" || true)
+    target_key=$(truncate_key "$file_path_full")
+  fi
+  is_error="${STUCK_FIELDS[2]}"
+  output_preview=$(printf '%s' "$input" \
+    | jq -r '(.tool_output.output // "" | tostring)[0:200]' \
+    | head -c 200 || true)
+  _read_stuck_fields '(.tool_input.command // ""), "\u0000",
+    (if (.tool_name == "Edit" or .tool_name == "Write")
+     then ((.tool_input.old_string // .tool_input.content // .tool_input.new_string // "")
+       | gsub("[[:space:]]+"; " ") | ltrimstr(" ") | rtrimstr(" ")
+       | (length as $l | if $l <= 120 then "\($l)#\(.)"
+          else ((explode | add // 0) as $sum
+            | "\($l)#\($sum)#\(.[0:80])#\(.[-40:])") end))
+     else "" end), "\u0000"'
+  [ "${#STUCK_FIELDS[@]}" -eq 2 ] || exit 1
+  raw_command="${STUCK_FIELDS[0]}"
+  edit_hash="${STUCK_FIELDS[1]}"
+else
 # Extract tool info
 tool_name=$(printf '%s' "$input" | jq -r '.tool_name // "unknown"')
 # Bash commands are NOT files. Feeding tool_input.command into file_path made
@@ -552,16 +636,6 @@ tool_name=$(printf '%s' "$input" | jq -r '.tool_name // "unknown"')
 # remove that collision class, so truncate_key() ALSO appends the ORIGINAL
 # length: two values that share the capped prefix but differ in total length
 # no longer produce the same key (M-3).
-TARGET_KEY_CAP=1000
-
-truncate_key() {
-  local v="$1"
-  if [ "${#v}" -gt "$TARGET_KEY_CAP" ]; then
-    printf '%s' "${v:0:$TARGET_KEY_CAP}#len=${#v}"
-  else
-    printf '%s' "$v"
-  fi
-}
 
 if [ "$tool_name" = "Bash" ]; then
   file_path=""
@@ -627,13 +701,35 @@ if [ "$tool_name" = "Edit" ] || [ "$tool_name" = "Write" ]; then
                   end)')
 fi
 
+fi
+
 # History entries are written by jq, so their "path" values are JSON-ENCODED.
 # Matching them requires the SAME encoding, not the raw text: a raw value
 # containing a quote (common in Bash commands) can never match the encoded
 # form. The previous BRE escaping was doubly broken — in POSIX BRE "( ) + ? { |"
 # are literals, so escaping them turned them INTO operators and silently
 # stopped matching. Encode once here and match with grep -F (fixed string).
-target_key_json=$(jq -n --arg v "$target_key" '$v')
+# JSON-encoded literals contain no raw NUL or LF, including legacy fields.
+encoded_matches=()
+while IFS= read -r -d '' encoded_match; do
+  encoded_matches[${#encoded_matches[@]}]="$encoded_match"
+done < <(
+  if jq -nj --arg path "$target_key" --arg edit "$edit_hash" \
+    '($path | tojson), "\u0000", ($edit | tojson), "\u0000"'; then
+    printf '%s\0' '__OMCUSTOM_JQ_STATUS__0'
+  else
+    printf '__OMCUSTOM_JQ_STATUS__%s\0' "$?"
+  fi
+)
+encoded_status="${encoded_matches[${#encoded_matches[@]}-1]:-}"
+case "$encoded_status" in
+  __OMCUSTOM_JQ_STATUS__0) ;;
+  __OMCUSTOM_JQ_STATUS__*) exit "${encoded_status#__OMCUSTOM_JQ_STATUS__}" ;;
+  *) exit 1 ;;
+esac
+[ "${#encoded_matches[@]}" -eq 3 ] || exit 1
+target_key_json="${encoded_matches[0]}"
+edit_hash_json="${encoded_matches[1]}"
 path_match="\"path\":${target_key_json}"
 
 # #1649 follow-up: edit_hash now preserves punctuation (see the edit_hash
@@ -642,7 +738,7 @@ path_match="\"path\":${target_key_json}"
 # (--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_json was encoded together with target_key_json above.
 edit_hash_match="\"edit_hash\":${edit_hash_json}"
 
 is_readonly="false"
@@ -651,7 +747,7 @@ if [ "$tool_name" = "Bash" ]; then
 fi
 
 # Session-scoped history
-HISTORY_FILE="/tmp/.claude-tool-history-${PPID}"
+HISTORY_FILE="${OMCUSTOM_STUCK_HISTORY_FILE:-/tmp/.claude-tool-history-${PPID}}"
 
 # Create entry
 timestamp=$(date -u +%Y-%m-%dT%H:%M:%SZ)

package/templates/.claude/rules/MAY-optimization.md

@@ -86,7 +86,7 @@ zsh는 미인용 `$var`를 단어분할하지 않습니다(#1683 #5) — 분할
 
 도구 이름 ≠ 그 프로그램(#1590): 사용 전 `type <tool>`로 실체를 확인합니다 — 이 저장소 Bash의 `grep`은 `.gitignore`를 존중하는 셸 함수이므로 저장소 전수조사는 `git grep`을 표준으로 합니다.
 
-Bash `cd`는 세션 cwd로 남습니다(#1778, #1767): 훅 명령은 `CLAUDE_PROJECT_DIR`로 고정되어 지속 `cd`에 영향받지 않지만, 상대 경로를 내부에서 읽는 스크립트·도구와 이후 명령의 상대 경로는 어긋날 수 있습니다 — 절대 경로나 서브셸 `( cd <dir> && … )`만 사용하고 지속 `cd`는 남기지 않습니다.
+Bash `cd`는 세션 cwd로 남습니다(#1778, #1767): 훅 명령은 `CLAUDE_PROJECT_DIR`로 고정되어 지속 `cd`에 영향받지 않지만, 상대 경로를 내부에서 읽는 스크립트·도구와 이후 명령의 상대 경로는 어긋날 수 있습니다 — 절대 경로나 서브셸 `( cd <dir> && … )`만 사용하고 지속 `cd`는 남기지 않습니다. `cd X && ( … )`도 `cd`가 서브셸 밖에 놓인 지속 `cd`이므로 금지합니다(#1816) — 괄호는 `cd` 앞에서 열어야 합니다.
 
 <!-- DETAIL: tool name vs program
 > **도구 이름 ≠ 그 프로그램 (#1590)**: 도구를 쓰기 전에 `type <tool>`로 실체를 확인한다. Bash 도구의 `grep`은 `~/.claude/shell-snapshots/snapshot-zsh-*.sh`의 **셸 함수**이며 `ugrep --ignore-files`에 위임한다. 그 결과 `.gitignore`의 리터럴 `CLAUDE.md` 패턴을 존중해, **force-tracked 파일을 재귀 탐색에서 조용히 누락**한다(에러 없이 exit 0). 명시 경로를 준 grep은 정상 동작하므로 **traversal만 영향**을 받는다. 실측(2026-08-15): 동일 패턴·동일 대상에 대해 셸 함수 36 / `command grep` 43 / `git grep` 38 히트 — 셸 함수만 `CLAUDE.md`를 0 히트로 놓쳤다. 진단 함정: `git check-ignore`는 **index-aware**라 tracked 파일에 "not ignored"(exit 1)를 반환한다 — 원인을 보려면 `git check-ignore --no-index`를 써야 한다. 처방: 저장소 전수 조사는 `git grep`을 표준으로 한다(R017 Count Sync cross-ref). Origin: #1590.

package/templates/.claude/rules/MUST-agent-design.md

@@ -47,8 +47,9 @@ Tier를 섞으면(예: frontmatter에 Tier-3 전용 값을 쓰거나 그 반대)
 | Full ID | Use Case |
 |---------|----------|
 | `claude-haiku-4-5` | Fast, cheap tasks |
+| `claude-haiku-5-5` | Default Haiku model on the Anthropic API (v2.1.293+); 1M context |
 | `claude-sonnet-5` | Native 1M context; previous-generation Sonnet (v2.1.197+; on the Anthropic API, `claude-sonnet-5-5` is now the default Sonnet model, v2.1.284+) |
-| `claude-sonnet-5-5` | Now the default Sonnet model on the Anthropic API (v2.1.284+); 1M context, $2/$10 per Mtok, $0.20/Mtok cache reads |
+| `claude-sonnet-5-5` | Now the default Sonnet model on the Anthropic API (v2.1.284+); 1M context, $2/$10 per Mtok, $0.10/Mtok cache reads in CC cost figures (v2.1.296; was $0.20) |
 | `claude-opus-4-6` | Opus, previous generation |
 | `claude-opus-4-8` | Opus, previous generation; supports xhigh effort |
 | `claude-opus-5` | Opus, previous generation (GA); native 1M context, fast mode at $10/$50 per Mtok |
@@ -164,7 +165,7 @@ Settings-level 가용성/과부하 failover — per-agent `model:` frontmatter
 ### Safe Mode & Bundled Skill Control (CC v2.1.169+)
 
 <!-- ARCHIVED CC version note (historical):
-> **v2.1.169+**: `--safe-mode` (and `CLAUDE_CODE_SAFE_MODE`) starts Claude Code with ALL customizations disabled (CLAUDE.md, plugins, skills, hooks, MCP servers) — use it to isolate whether a project customization (agent/skill/hook) causes a regression. The `disableBundledSkills` setting (and `CLAUDE_CODE_DISABLE_BUNDLED_SKILLS` env) hides bundled skills, workflows, and built-in slash commands from the model — useful when bundled skills conflict with or duplicate project skills (R006 skill-surface management). Note: `disableBundledSkills` hides skills from the model but is a CC platform setting, distinct from the advisory `skills:` frontmatter field (which is documentation metadata, not a runtime allowlist).
+> **v2.1.169+**: `--safe-mode` (and `CLAUDE_CODE_SAFE_MODE`) starts Claude Code with ALL customizations disabled (CLAUDE.md, plugins, skills, hooks, MCP servers) — use it to isolate whether a project customization (agent/skill/hook) causes a regression. The `disableBundledSkills` setting (and `CLAUDE_CODE_DISABLE_BUNDLED_SKILLS` env) hides bundled skills, workflows, and built-in slash commands from the model — useful when bundled skills conflict with or duplicate project skills (R006 skill-surface management). Note: `disableBundledSkills` hides skills from the model but is a CC platform setting, distinct from the `skills:` frontmatter field (which preloads the listed skills into the subagent but is not a runtime allowlist).
 -->
 
 <!-- ARCHIVED CC version notes (historical):
@@ -193,9 +194,9 @@ Key optional fields: `memory`, `effort`, `skills`, `soul`, `isolation`, `backgro
 ### Note on `skills:` field
 
 <!-- DETAIL: skills: field full rationale
-The `skills:` frontmatter field is **advisory metadata** consumed by oh-my-customcode tooling (graph-builder, mgr-sauron) for documentation and validation. It is **NOT a runtime allowlist** — Claude Code does not filter the available skills based on this field, and subagents can invoke any registered skill regardless of what `skills:` declares. Use it to document a subagent's intended skill dependencies; do not rely on it for access control.
+The `skills:` frontmatter field is read by oh-my-customcode tooling (graph-builder, mgr-sauron) for documentation and validation, and Claude Code itself PRELOADS the listed skills into the subagent (context cost; v2.1.295: "Changed subagents to preload at most 32 skills from the `skills` field, each once; a subagent with the Skill tool can still invoke the rest" — preloading predates 2.1.295: the 2.0.43 CHANGELOG entry is the primary source — "Added skills frontmatter field to declare skills to auto-load for subagents" — and the 2.1.265 entry also refers to "preloaded skills"). It is **NOT a runtime allowlist** — Claude Code does not restrict skill access based on this field, so do not rely on it for access control.
 -->
-`skills:` frontmatter는 **advisory metadata일 뿐 runtime allowlist가 아닙니다** — CC는 이 필드로 스킬 접근을 제한하지 않으므로, access control로 의존하지 마세요(문서화 용도로만 사용).
+`skills:` frontmatter는 **runtime allowlist가 아닙니다** — CC는 이 필드로 스킬 접근을 제한하지 않으므로, access control로 의존하지 마세요(나열 스킬은 사전 로드됩니다, 최대 32개).
 
 <!-- DETAIL: skills: field issue reference
 Reference: research findings on issue #1055 (closed not-planned).

package/templates/.claude/rules/SHOULD-memory-integration.md

@@ -259,7 +259,7 @@ MEMORY.md supports an optional `## User Model` section (DISTINCT from `## Behavi
     - Focus: AI agent orchestration, CLI tooling
 
     ### Override Decisions [confidence: low]
-    - Overrode /scout SKIP verdict → INTEGRATE for RTK (#756) (과거 결정 예시입니다. RTK 프로젝트 통합은 v2.0.0에서 퇴역하며 현재 실행 추천으로 해석하지 마십시오.)
+    - Overrode /scout SKIP verdict → INTEGRATE for RTK (#756) (과거 결정 예시입니다. RTK 프로젝트 통합은 v1.1.107에서 퇴역하며 현재 실행 추천으로 해석하지 마십시오.)
 
 ### Categories
 

package/templates/.claude/rules/SHOULD-verification-ladder.md

@@ -101,6 +101,15 @@ Fable 5 실행 에이전트/스킬은 지시(instruction) 장문화가 오히려
 - [ ] Tier 1에서 잡을 수 있는 문제를 다루는가? (상위 tier 대신 시프트 권고)
 - [ ] Ladder 순서를 문서화했는가? (어떤 검사를 먼저 실행하는지)
 
+### 문구 작성·정정
+
+새 주석/JSDoc/문서의 문구 작성·정정 시 확인합니다(#1816 H1):
+
+- [ ] 새 문구의 사실 절마다 코드 앵커 또는 실제 관측 출력을 대응표에 기록했는가?
+- [ ] 독립 문구 검토로 사실 절과 근거의 대응을 확인했는가?
+
+lint·typecheck·테스트 통과만으로 문구의 사실 정확성을 확정하지 않습니다. pipeline auto-dev의 문구 검토 요구와 함께 확인합니다.
+
 ## Safety-Signal Rule Authoring — Carve-Out Pre-Check (shift-left)
 
 <!-- DETAIL: Origin note