oh-my-customcode 2.0.7 → 2.0.9

package/README.md

@@ -117,13 +117,14 @@ Soft default is 4 concurrent agents, hard cap 5. Agent Teams (shared task list,
 
 | Category | Count | Agents |
 |----------|-------|--------|
-| Languages | 6 | lang-golang, lang-python, lang-rust, lang-kotlin, lang-typescript, lang-java21 |
+| Languages | 6 | lang-golang, lang-python, lang-rust, lang-kotlin, lang-typescript, lang-java |
 | Backend | 6 | be-fastapi, be-springboot, be-go-backend, be-express, be-nestjs, be-django |
 | Frontend | 5 | fe-vercel, fe-vuejs, fe-svelte, fe-flutter, fe-design |
 | Data Engineering | 6 | de-airflow, de-dbt, de-spark, de-kafka, de-snowflake, de-pipeline |
 | Database | 4 | db-supabase, db-postgres, db-redis, db-alembic |
 | Tooling | 4 | tool-npm, tool-optimizer, tool-bun, slack-cli |
-| Architecture | 3 | arch-documenter, arch-speckit, agora-runner |
+| Architecture | 2 | arch-documenter, arch-speckit |
+| Agora | 1 | agora-runner |
 | Infrastructure | 2 | infra-docker, infra-aws |
 | QA | 3 | qa-planner, qa-writer, qa-engineer |
 | Security | 1 | sec-codeql |

package/dist/cli/index.js

@@ -335,7 +335,7 @@ var init_package = __esm(() => {
     workspaces: [
       "packages/*"
     ],
-    version: "2.0.7",
+    version: "2.0.9",
     description: "Batteries-included agent harness for Claude Code",
     type: "module",
     bin: {
@@ -17315,7 +17315,11 @@ import { basename as basename3, join as join8 } from "node:path";
 // src/core/hook-group-merge.ts
 var LEGACY_OMCUSTOM_DESCRIPTIONS = [
   "Record agent outcomes + auto-continue workflow + R007/R008 drift advisory on subagent completion (autonomous-loop re-entry, #1545)",
-  'Re-inject project CLAUDE.md into model context on session start/resume/clear and compact re-entry — matcher "*" covers all SessionStart sources including "compact" (#1617)'
+  'Re-inject project CLAUDE.md into model context on session start/resume/clear and compact re-entry — matcher "*" covers all SessionStart sources including "compact" (#1617)',
+  "Block dev servers outside tmux - ensures you can access logs",
+  "Block creation of random .md files - keeps docs consolidated",
+  "Record agent outcomes + auto-continue workflow + R007/R008 drift advisory + failure advisory on subagent completion (autonomous-loop re-entry, #1545; #1631 replaced the self-referential prompt-type judge hook with an advisory-only command hook)",
+  "Validate externally modified files — advisory staleness warning (v2.1.83+)"
 ];
 var STANDALONE_SCRIPT_COMMAND = /^(?:bash )?(?:"(?:\$\{CLAUDE_PROJECT_DIR:-\.\}\/|\.\/)?\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh)"|(?:\.\/)?\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh))$/;
 var SCRIPT_REFERENCE = /\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh)/g;
@@ -18199,6 +18203,16 @@ function analyzeMatcher(raw) {
   }
   return analyzeMixedAndExpr(ast, raw);
 }
+var FILE_CHANGED_LITERAL_SEGMENT = /^(?!\.+$)[A-Za-z0-9._-]+$/;
+function analyzeFileChangedMatcher(raw) {
+  if (raw === undefined)
+    return null;
+  const segments = raw.split("|");
+  if (!segments.every((segment) => FILE_CHANGED_LITERAL_SEGMENT.test(segment))) {
+    return null;
+  }
+  return { toolRegex: raw, fieldNode: null };
+}
 function fieldNodeToJq(node) {
   switch (node.kind) {
     case "and":
@@ -18235,9 +18249,9 @@ function buildGuardedCommand(jqCond, originalCommand) {
 var CLASSIFICATION_TABLE = [
   {
     event: "PreToolUse",
-    description: "Block dev servers outside tmux - ensures you can access logs",
+    description: "Advise (additionalContext, never blocks) when a foreground dev server starts outside tmux/run_in_background - keeps logs accessible",
     decision: "wrap-guard",
-    reason: 'inline script unconditionally `exit 1`-blocks on ANY match once invoked; it never re-parses tool_input.command, so widening the matcher to bare "Bash" would block every Bash call'
+    reason: "inline script is an advisory (always exit 0, additionalContext only); it re-parses tool_input.command for a dev command at command position and stays silent for tmux, `run_in_background: true`, backgrounded and mention-only commands, but the wrap-guard is kept as a cheap pre-filter so non-matching Bash calls do not spawn the POSIX-sh segment parser"
   },
   {
     event: "PreToolUse",
@@ -18253,9 +18267,9 @@ var CLASSIFICATION_TABLE = [
   },
   {
     event: "PreToolUse",
-    description: "Block creation of random .md files - keeps docs consolidated",
+    description: "Non-blocking notice on new .md/.txt files (exit 1) - keeps docs consolidated",
     decision: "drop-condition",
-    reason: "inline script re-parses tool_input.file_path via jq and re-tests both the `\\.(md|txt)$` and the README/CLAUDE/AGENT/SKILL exclusion with its own [[ =~ ]] checks before blocking — the matcher condition is fully redundant with the script body"
+    reason: "inline script re-parses tool_input.file_path via jq and re-tests both the `\\.(md|txt)$` and the README/CLAUDE/AGENT/SKILL exclusion with its own POSIX `case` patterns before printing its non-blocking exit-1 notice (per a CC 2.1.310 runtime probe, neither the tool block nor the stderr of an exit-1 PreToolUse hook reaches the model) — the matcher condition is fully redundant with the script body"
   },
   {
     event: "PreToolUse",
@@ -18339,16 +18353,23 @@ function convertHookCommand(cmd, fieldNode, decision, warnCollector, context) {
     command: buildGuardedCommand(jqCond, cmd.command)
   };
 }
+function warnNonLiteralFileChangedMatcher(event, rawMatcher, analysis, context, warnCollector) {
+  if (event !== "FileChanged" || rawMatcher === undefined || analyzeFileChangedMatcher(rawMatcher) !== null) {
+    return;
+  }
+  warnCollector.push(`hooks: ${context} — FileChanged matcher ${JSON.stringify(rawMatcher)} is not a |-separated list of literal filenames; FileChanged matchers are literal filenames (not tool-name regexes, globs, or expressions), so the converted matcher ${JSON.stringify(analysis.toolRegex)} would watch a file of that exact name — use e.g. "CLAUDE.md|bun.lock"`);
+}
 function convertHooksEntry(event, entry, warnCollector) {
   const context = `${event} / "${entry.description ?? "(no description)"}"`;
   let analysis;
   try {
-    analysis = analyzeMatcher(entry.matcher);
+    analysis = (event === "FileChanged" ? analyzeFileChangedMatcher(entry.matcher) : null) ?? analyzeMatcher(entry.matcher);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     warnCollector.push(`hooks: ${context} — matcher could not be auto-converted, entry EXCLUDED: ${message}`);
     return null;
   }
+  warnNonLiteralFileChangedMatcher(event, entry.matcher, analysis, context, warnCollector);
   let decision = "auto";
   if (analysis.fieldNode !== null) {
     const classification = findClassification(event, entry.description);

package/dist/index.js

@@ -1151,7 +1151,11 @@ import { basename, join as join3 } from "node:path";
 // src/core/hook-group-merge.ts
 var LEGACY_OMCUSTOM_DESCRIPTIONS = [
   "Record agent outcomes + auto-continue workflow + R007/R008 drift advisory on subagent completion (autonomous-loop re-entry, #1545)",
-  'Re-inject project CLAUDE.md into model context on session start/resume/clear and compact re-entry — matcher "*" covers all SessionStart sources including "compact" (#1617)'
+  'Re-inject project CLAUDE.md into model context on session start/resume/clear and compact re-entry — matcher "*" covers all SessionStart sources including "compact" (#1617)',
+  "Block dev servers outside tmux - ensures you can access logs",
+  "Block creation of random .md files - keeps docs consolidated",
+  "Record agent outcomes + auto-continue workflow + R007/R008 drift advisory + failure advisory on subagent completion (autonomous-loop re-entry, #1545; #1631 replaced the self-referential prompt-type judge hook with an advisory-only command hook)",
+  "Validate externally modified files — advisory staleness warning (v2.1.83+)"
 ];
 var STANDALONE_SCRIPT_COMMAND = /^(?:bash )?(?:"(?:\$\{CLAUDE_PROJECT_DIR:-\.\}\/|\.\/)?\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh)"|(?:\.\/)?\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh))$/;
 var SCRIPT_REFERENCE = /\.claude\/hooks\/((?:scripts\/)?[A-Za-z0-9._-]+\.sh)/g;
@@ -1788,6 +1792,16 @@ function analyzeMatcher(raw) {
   }
   return analyzeMixedAndExpr(ast, raw);
 }
+var FILE_CHANGED_LITERAL_SEGMENT = /^(?!\.+$)[A-Za-z0-9._-]+$/;
+function analyzeFileChangedMatcher(raw) {
+  if (raw === undefined)
+    return null;
+  const segments = raw.split("|");
+  if (!segments.every((segment) => FILE_CHANGED_LITERAL_SEGMENT.test(segment))) {
+    return null;
+  }
+  return { toolRegex: raw, fieldNode: null };
+}
 function fieldNodeToJq(node) {
   switch (node.kind) {
     case "and":
@@ -1824,9 +1838,9 @@ function buildGuardedCommand(jqCond, originalCommand) {
 var CLASSIFICATION_TABLE = [
   {
     event: "PreToolUse",
-    description: "Block dev servers outside tmux - ensures you can access logs",
+    description: "Advise (additionalContext, never blocks) when a foreground dev server starts outside tmux/run_in_background - keeps logs accessible",
     decision: "wrap-guard",
-    reason: 'inline script unconditionally `exit 1`-blocks on ANY match once invoked; it never re-parses tool_input.command, so widening the matcher to bare "Bash" would block every Bash call'
+    reason: "inline script is an advisory (always exit 0, additionalContext only); it re-parses tool_input.command for a dev command at command position and stays silent for tmux, `run_in_background: true`, backgrounded and mention-only commands, but the wrap-guard is kept as a cheap pre-filter so non-matching Bash calls do not spawn the POSIX-sh segment parser"
   },
   {
     event: "PreToolUse",
@@ -1842,9 +1856,9 @@ var CLASSIFICATION_TABLE = [
   },
   {
     event: "PreToolUse",
-    description: "Block creation of random .md files - keeps docs consolidated",
+    description: "Non-blocking notice on new .md/.txt files (exit 1) - keeps docs consolidated",
     decision: "drop-condition",
-    reason: "inline script re-parses tool_input.file_path via jq and re-tests both the `\\.(md|txt)$` and the README/CLAUDE/AGENT/SKILL exclusion with its own [[ =~ ]] checks before blocking — the matcher condition is fully redundant with the script body"
+    reason: "inline script re-parses tool_input.file_path via jq and re-tests both the `\\.(md|txt)$` and the README/CLAUDE/AGENT/SKILL exclusion with its own POSIX `case` patterns before printing its non-blocking exit-1 notice (per a CC 2.1.310 runtime probe, neither the tool block nor the stderr of an exit-1 PreToolUse hook reaches the model) — the matcher condition is fully redundant with the script body"
   },
   {
     event: "PreToolUse",
@@ -1928,16 +1942,23 @@ function convertHookCommand(cmd, fieldNode, decision, warnCollector, context) {
     command: buildGuardedCommand(jqCond, cmd.command)
   };
 }
+function warnNonLiteralFileChangedMatcher(event, rawMatcher, analysis, context, warnCollector) {
+  if (event !== "FileChanged" || rawMatcher === undefined || analyzeFileChangedMatcher(rawMatcher) !== null) {
+    return;
+  }
+  warnCollector.push(`hooks: ${context} — FileChanged matcher ${JSON.stringify(rawMatcher)} is not a |-separated list of literal filenames; FileChanged matchers are literal filenames (not tool-name regexes, globs, or expressions), so the converted matcher ${JSON.stringify(analysis.toolRegex)} would watch a file of that exact name — use e.g. "CLAUDE.md|bun.lock"`);
+}
 function convertHooksEntry(event, entry, warnCollector) {
   const context = `${event} / "${entry.description ?? "(no description)"}"`;
   let analysis;
   try {
-    analysis = analyzeMatcher(entry.matcher);
+    analysis = (event === "FileChanged" ? analyzeFileChangedMatcher(entry.matcher) : null) ?? analyzeMatcher(entry.matcher);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     warnCollector.push(`hooks: ${context} — matcher could not be auto-converted, entry EXCLUDED: ${message}`);
     return null;
   }
+  warnNonLiteralFileChangedMatcher(event, entry.matcher, analysis, context, warnCollector);
   let decision = "auto";
   if (analysis.fieldNode !== null) {
     const classification = findClassification(event, entry.description);
@@ -2906,7 +2927,7 @@ var package_default = {
   workspaces: [
     "packages/*"
   ],
-  version: "2.0.7",
+  version: "2.0.9",
   description: "Batteries-included agent harness for Claude Code",
   type: "module",
   bin: {

package/package.json

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

package/templates/.claude/hooks/hooks.json

@@ -17,10 +17,10 @@
         "hooks": [
           {
             "type": "command",
-            "command": "#!/bin/bash\ninput=$(cat)\ncmd=$(printf '%s\\n' \"$input\" | jq -r '.tool_input.command // \"\"')\n\n# Block dev servers that aren't run in tmux\necho '[Hook] BLOCKED: Dev server must run in tmux for log access' >&2\necho '[Hook] Use this command instead:' >&2\necho \"[Hook] tmux new-session -d -s dev 'npm run dev'\" >&2\necho '[Hook] Then: tmux attach -t dev' >&2\nexit 1"
+            "command": "#!/bin/sh\ninput=$(cat)\ncmd=$(printf '%s' \"$input\" | jq -r '.tool_input.command // \"\"' 2>/dev/null)\nbg=$(printf '%s' \"$input\" | jq -r '.tool_input.run_in_background // false' 2>/dev/null)\n\n# Advisory only: never blocks (always exit 0). Stay silent for background runs, tmux-wrapped commands,\n# mentions of the dev command in other commands, and variants like dev:test / develop / devtools.\n[ \"$bg\" = \"true\" ] && exit 0\nif printf '%s' \"$cmd\" | grep -Eq '^[[:space:]]*tmux([[:space:]]|$)'; then exit 0; fi\n\n# Drop quoted strings, then split into segments at && || ; | ( ) and newlines\nsegs=$(printf '%s' \"$cmd\" | sed -e 's/\"[^\"]*\"//g' -e \"s/'[^']*'//g\" -e 's/&&/;/g' -e 's/||/;/g' | tr ';|()\\n' '\\n\\n\\n\\n\\n')\n\n# Command position (optionally after VAR=value), word boundary after the dev command, segment not backgrounded with &\nhit=$(printf '%s\\n' \"$segs\" | grep -E '^[[:space:]]*([A-Za-z_][A-Za-z0-9_]*=[^[:space:]]*[[:space:]]+)*(npm run dev|pnpm( run)? dev|yarn dev|bun run dev)([[:space:])]|$)' | grep -Ev '(^|[^>&])&([^&>]|$)' | head -n 1)\n\nif [ -n \"$hit\" ]; then\n  printf '%s\\n' '{\"hookSpecificOutput\":{\"hookEventName\":\"PreToolUse\",\"additionalContext\":\"[Hook] 포그라운드 dev 서버 시작이 감지되었습니다. 로그 접근을 위해 run_in_background: true 로 실행하거나 tmux 세션(예: tmux new-session -d -s dev) 안에서 실행하는 것을 권장합니다. 이 알림은 차단하지 않습니다.\"}}'\nfi\nexit 0"
           }
         ],
-        "description": "Block dev servers outside tmux - ensures you can access logs"
+        "description": "Advise (additionalContext, never blocks) when a foreground dev server starts outside tmux/run_in_background - keeps logs accessible"
       },
       {
         "matcher": "tool == \"Bash\" && tool_input.command matches \"(npm (install|test)|pnpm (install|test)|yarn (install|test)|bun (install|test)|cargo build|make|docker|pytest|vitest|playwright)\"",
@@ -47,10 +47,10 @@
         "hooks": [
           {
             "type": "command",
-            "command": "#!/bin/bash\ninput=$(cat)\nfile_path=$(printf '%s\\n' \"$input\" | jq -r '.tool_input.file_path // \"\"')\n\nif [[ \"$file_path\" =~ \\.(md|txt)$ ]] && [[ ! \"$file_path\" =~ (README|CLAUDE|AGENT|SKILL)\\.md$ ]]; then\n  echo \"[Hook] BLOCKED: Unnecessary documentation file creation\" >&2\n  echo \"[Hook] File: $file_path\" >&2\n  echo \"[Hook] Use README.md or AGENT.md for documentation instead\" >&2\n  exit 1\nfi\n\nprintf '%s\\n' \"$input\""
+            "command": "#!/bin/sh\ninput=$(cat)\nfile_path=$(printf '%s\\n' \"$input\" | jq -r '.tool_input.file_path // \"\"')\n\ncase \"$file_path\" in\n  *README.md|*CLAUDE.md|*AGENT.md|*SKILL.md) ;;\n  *.md|*.txt)\n    echo \"[Hook] NOTICE (non-blocking): new documentation file - the write is not blocked\" >&2\n    echo \"[Hook] File: $file_path\" >&2\n    echo \"[Hook] Prefer README.md or AGENT.md for documentation if this is not a deliberate new doc\" >&2\n    exit 1\n    ;;\nesac\n\nprintf '%s\\n' \"$input\""
           }
         ],
-        "description": "Block creation of random .md files - keeps docs consolidated"
+        "description": "Non-blocking notice on new .md/.txt files (exit 1) - keeps docs consolidated"
       },
       {
         "matcher": "tool == \"Edit\" || tool == \"Write\"",
@@ -102,6 +102,16 @@
         ],
         "description": "Block rule file deletion — requires individual user confirmation per rule (R001 safety)"
       },
+      {
+        "matcher": "tool == \"Bash\"",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/scripts/bash-cd-advisor.sh\""
+          }
+        ],
+        "description": "Advise against top-level (non-subshell) cd in Bash commands; cd persists as session cwd (R005, #1834/#1816 H2)"
+      },
       {
         "matcher": "tool == \"Task\" || tool == \"Agent\"",
         "hooks": [
@@ -274,13 +284,9 @@
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/scripts/r007-r008-drift-advisor.sh\""
-          },
-          {
-            "type": "command",
-            "command": "bash \"${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/scripts/subagent-failure-advisor.sh\""
           }
         ],
-        "description": "Record agent outcomes + auto-continue workflow + R007/R008 drift advisory + failure advisory on subagent completion (autonomous-loop re-entry, #1545; #1631 replaced the self-referential prompt-type judge hook with an advisory-only command hook)"
+        "description": "Record agent outcomes + stall and consecutive-completion advisories + R007/R008 drift advisory on subagent completion — advisory-only, never continues or blocks the workflow (autonomous-loop re-entry, #1545; #1631 replaced the self-referential prompt-type judge hook with an advisory-only command hook; #1880)"
       }
     ],
     "CwdChanged": [
@@ -297,14 +303,14 @@
     ],
     "FileChanged": [
       {
-        "matcher": "*",
+        "matcher": "CLAUDE.md|bun.lock|yarn.lock|Cargo.lock|poetry.lock|package-lock.json|pnpm-lock.yaml",
         "hooks": [
           {
             "type": "command",
             "command": "bash \"${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/scripts/file-change-validator.sh\""
           }
         ],
-        "description": "Validate externally modified files — advisory staleness warning (v2.1.83+)"
+        "description": "Warn on external changes to CLAUDE.md and the bun/yarn/Cargo/poetry/npm/pnpm lock files in the working directory — stderr shown to the user only, never blocks; the matcher lists literal filenames because CC registers each |-separated segment as a literal file to watch (v2.1.83+, #1775)"
       }
     ],
     "Notification": [
@@ -385,7 +391,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "#!/bin/bash\ninput=$(cat)\ncmd=$(printf '%s\\n' \"$input\" | jq -r '.tool_input.command')\n\nif echo \"$cmd\" | grep -qE 'gh pr create'; then\n  output=$(printf '%s\\n' \"$input\" | jq -r '.tool_output.output // \"\"')\n  pr_url=$(echo \"$output\" | grep -oE 'https://github.com/[^/]+/[^/]+/pull/[0-9]+')\n  \n  if [ -n \"$pr_url\" ]; then\n    echo \"[Hook] PR created: $pr_url\" >&2\n    echo \"[Hook] Checking GitHub Actions status...\" >&2\n    repo=$(echo \"$pr_url\" | sed -E 's|https://github.com/([^/]+/[^/]+)/pull/[0-9]+|\\1|')\n    pr_num=$(echo \"$pr_url\" | sed -E 's|.*/pull/([0-9]+)|\\1|')\n    echo \"[Hook] To review PR: gh pr review $pr_num --repo $repo\" >&2\n  fi\nfi\n\nprintf '%s\\n' \"$input\""
+            "command": "#!/bin/bash\ninput=$(cat)\ncmd=$(printf '%s\\n' \"$input\" | jq -r '.tool_input.command')\n\nif echo \"$cmd\" | grep -qE 'gh pr create'; then\n  output=$(printf '%s\\n' \"$input\" | jq -r '.tool_response.stdout // .tool_output.output // \"\"')\n  pr_url=$(echo \"$output\" | grep -oE 'https://github.com/[^/]+/[^/]+/pull/[0-9]+')\n  \n  if [ -n \"$pr_url\" ]; then\n    echo \"[Hook] PR created: $pr_url\" >&2\n    echo \"[Hook] Checking GitHub Actions status...\" >&2\n    repo=$(echo \"$pr_url\" | sed -E 's|https://github.com/([^/]+/[^/]+)/pull/[0-9]+|\\1|')\n    pr_num=$(echo \"$pr_url\" | sed -E 's|.*/pull/([0-9]+)|\\1|')\n    echo \"[Hook] To review PR: gh pr review $pr_num --repo $repo\" >&2\n  fi\nfi\n\nprintf '%s\\n' \"$input\""
           }
         ],
         "description": "Log PR URL and provide review command after PR creation"
@@ -499,7 +505,7 @@
         "description": "Advisory cost cap monitoring — warn when session cost approaches configurable limit"
       },
       {
-        "matcher": "tool == \"Read\"",
+        "matcher": "tool == \"Read\" || tool == \"Edit\" || tool == \"Write\"",
         "hooks": [
           {
             "type": "command",
@@ -632,6 +638,16 @@
           }
         ],
         "description": "FAIL-axis instrumentation — append tool failures to the error ledger (JSONL). Never blocks; feeds fail-axis-cause-advisor.sh (#1561)"
+      },
+      {
+        "matcher": "tool == \"Task\" || tool == \"Agent\"",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"${CLAUDE_PROJECT_DIR:-.}/.claude/hooks/scripts/subagent-failure-advisor.sh\""
+          }
+        ],
+        "description": "Advise on failed Agent/Task spawns via additionalContext (e.g. unknown subagent_type). Advisory only (additionalContext); the script's only explicit exit is exit 0 (#1775)"
       }
     ]
   }

package/templates/.claude/hooks/scripts/agent-teams-advisor.sh

@@ -7,7 +7,11 @@ command -v jq >/dev/null 2>&1 || exit 0
 # Agent Teams Advisor Hook
 # Trigger: PreToolUse, tool == "Task" || tool == "Agent"
 # Purpose: Track Agent/Task tool usage count per session and warn when Agent Teams may be more appropriate
-# Protocol: stdin JSON -> process -> stdout pass-through, exit 0 always (advisory only)
+# Protocol: stdin JSON -> process -> exit 0 always (advisory only)
+# Once per session (#1885): each distinct advisory key is shown at most once, claimed atomically via a
+# per-key marker dir under /tmp/.claude-teams-advisory-shown-${PPID}.d/ (parallel-hook safe).
+# Channel (#1885): exit-0 stderr never reaches the model (CC 2.1.310 probe, #1775 comment 6405197553);
+#   the advisory is delivered as stdout JSON hookSpecificOutput.additionalContext. No stdin passthrough.
 
 input=$(cat)
 
@@ -25,7 +29,6 @@ ENV_STATUS="/tmp/.claude-env-status-${PPID}"
 if [ -f "$ENV_STATUS" ]; then
   teams_status=$(grep "agent_teams=" "$ENV_STATUS" 2>/dev/null | cut -d= -f2 || echo "unknown")
   if [ "$teams_status" != "enabled" ]; then
-    printf '%s\n' "$input"
     exit 0
   fi
 fi
@@ -36,6 +39,9 @@ BATCH_ISSUES=0
 WORKFLOW_FILE=$(ls /tmp/.claude-workflow-*-"${PPID}".json 2>/dev/null | head -1 || true)
 if [ -n "$WORKFLOW_FILE" ] && [ -f "$WORKFLOW_FILE" ]; then
   BATCH_ISSUES=$(jq -r '.issue_count // 0' "$WORKFLOW_FILE" 2>/dev/null || echo 0)
+  # Sanitize before arithmetic: non-numeric/over-long -> 0; 10# avoids base-8 errors on leading zeros.
+  case "$BATCH_ISSUES" in ''|*[!0-9]*|??????????*) BATCH_ISSUES=0 ;; esac
+  BATCH_ISSUES=$((10#$BATCH_ISSUES))
 fi
 
 # Also check release-plan context (existence only — if file exists, treat as batch)
@@ -48,38 +54,57 @@ fi
 
 # Extract task info from input
 agent_type=$(printf '%s\n' "$input" | jq -r '.tool_input.subagent_type? // "unknown"')
-prompt_preview=$(printf '%s\n' "$input" | jq -r '.tool_input.description? // ""' | head -c 60)
+prompt_preview=$(printf '%s\n' "$input" | jq -r '(.tool_input.description? // "") | tostring | .[0:60]')
 
 # Session-scoped counter using parent PID as session identifier
 COUNTER_FILE="/tmp/.claude-task-count-${PPID}"
 
 # Read and increment counter
 if [ -f "$COUNTER_FILE" ]; then
-  COUNT=$(cat "$COUNTER_FILE")
+  COUNT=$(cat "$COUNTER_FILE" 2>/dev/null || echo 0)
+  case "$COUNT" in ''|*[!0-9]*|??????????*) COUNT=0 ;; esac
+  COUNT=$((10#$COUNT))
   COUNT=$((COUNT + 1))
 else
   COUNT=1
 fi
-echo "$COUNT" > "$COUNTER_FILE"
+{ echo "$COUNT" > "$COUNTER_FILE"; } 2>/dev/null || true
+
+SHOWN_DIR="/tmp/.claude-teams-advisory-shown-${PPID}.d"
+# fresh KEY: atomic claim via mkdir of a per-key marker dir (hash of KEY; no shared file, so no
+# check-then-append race and no newline pollution). Success => emit. State failures are silent;
+# if the marker dir itself is unusable we fail open (emit) rather than lose the advisory.
+fresh() {
+  { mkdir -p "$SHOWN_DIR"; } 2>/dev/null || true
+  [ -d "$SHOWN_DIR" ] || return 0
+  local h
+  h=$(printf '%s' "$1" | cksum | cut -d' ' -f1) || h=""
+  [ -n "$h" ] || return 0
+  if { mkdir "$SHOWN_DIR/$h"; } 2>/dev/null; then return 0; fi
+  return 1
+}
 
 # Warn when batch context detected (even on first call) or from 2nd call onward
-if [ "$BATCH_ISSUES" -ge 3 ] && [ "$COUNT" -eq 1 ]; then
-  echo "" >&2
-  echo "--- [R018 Advisor] Batch context detected (${BATCH_ISSUES} issues) ---" >&2
-  echo "  RECOMMENDATION: Use Agent Teams (TeamCreate) for this batch." >&2
-  echo "  Current: Agent(${agent_type}) -- ${prompt_preview}" >&2
-  echo "-----------------------------------------------------------" >&2
-elif [ "$COUNT" -ge 2 ]; then
-  echo "" >&2
-  echo "--- [R018 Advisor] Agent/Task tool call #${COUNT} in this session ---" >&2
-  echo "  WARNING: Multiple Task calls detected. Consider Agent Teams if:" >&2
-  echo "    * 3+ agents needed for this work" >&2
-  echo "    * Review -> fix -> re-review cycle exists" >&2
-  echo "    * Agents need shared state or coordination" >&2
-  echo "  Current: Agent(${agent_type}) -- ${prompt_preview}" >&2
-  echo "-----------------------------------------------------------" >&2
+ctx=""
+if [ "$BATCH_ISSUES" -ge 3 ] && [ "$COUNT" -eq 1 ] && fresh "batch:${BATCH_ISSUES}"; then
+  ctx="
+--- [R018 Advisor] Batch context detected (${BATCH_ISSUES} issues) ---
+  RECOMMENDATION: Use Agent Teams (TeamCreate) for this batch.
+  Current: Agent(${agent_type}) -- ${prompt_preview}
+-----------------------------------------------------------"
+elif [ "$COUNT" -ge 2 ] && fresh "repeat"; then
+  ctx="
+--- [R018 Advisor] Agent/Task tool call #${COUNT} in this session ---
+  WARNING: Multiple Task calls detected. Consider Agent Teams if:
+    * 3+ agents needed for this work
+    * Review -> fix -> re-review cycle exists
+    * Agents need shared state or coordination
+  Current: Agent(${agent_type}) -- ${prompt_preview}
+-----------------------------------------------------------"
 fi
 
-# Always pass through -- advisory only, never blocks
-printf '%s\n' "$input"
+# Advisory only, never blocks: emit additionalContext when there is something to say
+if [ -n "$ctx" ]; then
+  jq -cn --arg ctx "$ctx" '{hookSpecificOutput:{hookEventName:"PreToolUse",additionalContext:$ctx}}'
+fi
 exit 0

package/templates/.claude/hooks/scripts/auto-continue-guard.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 set -euo pipefail
 
-# Auto-Continue Guard
+# Consecutive-Completion Guard (file name kept for hook wiring)
 # Trigger: SubagentStop
-# Purpose: Count consecutive subagent completions and warn when auto-continue limit reached
+# Purpose: Count consecutive subagent completions and emit an advisory from the 4th consecutive completion on
 # Protocol: stdin JSON -> count check -> stdout pass-through, the only explicit exit is exit 0 (R021); under set -u a corrupt counter file can exit 1 (non-blocking for SubagentStop)
 
 input=$(cat)
 
 count_file="/tmp/.claude-loop-count-${PPID}"
 
-# Reset counter if stale (>60s since last update)
+# Reset counter if >60s idle since the LAST update (window chains per completion)
 if [ -f "$count_file" ]; then
   last_mod=$(stat -c%Y "$count_file" 2>/dev/null || stat -f%m "$count_file" 2>/dev/null || echo 0)
   now=$(date +%s)
@@ -24,9 +24,9 @@ count=$(cat "$count_file" 2>/dev/null || echo 0)
 count=$((count + 1))
 echo "$count" > "$count_file"
 
-# Warn if limit reached
+# Advisory from the 4th consecutive completion (each within 60s of the previous)
 if [ "$count" -ge 4 ]; then
-  echo '[AutoContinue] SAFETY: auto-continue limit (3) reached. Pausing.' >&2
+  echo '[ConsecutiveCompletions] ADVISORY: 4+ consecutive subagent completions, each within 60s of the previous (advisory only; nothing is paused).' >&2
 fi
 
 printf '%s\n' "$input"

package/templates/.claude/hooks/scripts/auto-dev-token-tracker.sh

@@ -24,7 +24,18 @@ LOG_FILE="/tmp/auto-dev-spend-${PPID}.json"
 agent_type=$(printf '%s\n' "$input" | jq -r '.tool_input.subagent_type // "unknown"' 2>/dev/null || echo "unknown")
 description=$(printf '%s\n' "$input" | jq -r '.tool_input.description // ""' 2>/dev/null || echo "")
 prompt_text=$(printf '%s\n' "$input" | jq -r '.tool_input.prompt // ""' 2>/dev/null || echo "")
-output_text=$(printf '%s\n' "$input" | jq -r '.tool_output.output // .tool_output // ""' 2>/dev/null || echo "")
+# PostToolUse carries "tool_response", not "tool_output" (#1775; probe: CC 2.1.310,
+# "claude -p", one run, haiku). Measured async Agent launch shape: object {agentId,
+# canContinueAgent, canReadOutputFile, description, isAsync, outputFile, prompt,
+# resolvedModel, status:"async_launched"} - it has NO subagent result text, so the
+# tokens_out estimate is 0 for async launches. A synchronous Agent result shape was
+# NOT measured [가설]; a string tool_response or an object .stdout/.output string is
+# used when present, then the legacy .tool_output fallback.
+output_text=$(printf '%s\n' "$input" | jq -r '
+  (.tool_response) as $r
+  | if ($r | type) == "string" then $r
+    elif ($r | type) == "object" and (($r.stdout // $r.output | type) == "string") then ($r.stdout // $r.output)
+    else (.tool_output.output // .tool_output // "") end' 2>/dev/null || echo "")
 
 # Derive phase from pipeline state (current_phase) or fallback to description prefix
 phase=$(jq -r '.current_phase // .phase // "unknown"' "$PIPELINE_STATE" 2>/dev/null || echo "unknown")