etymd 0.19.0 → 0.19.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # etymd
 
+## 0.19.2
+
+### Patch Changes
+
+- b46bbb9: Generated pre-push hooks check only the shell scripts each pushed commit changes, instead of
+  every script in every pushed commit's tree. A commit that changes the gate itself, its
+  classifier or a `.shellcheckrc` (deletions included) is still checked whole. So is the commit
+  that installs the gate, which reads a repo's existing scripts once. A commit with no shell
+  script says so. Pointer checks no longer accept an `@AGENTS.md` import inside a fenced code
+  block, an unreadable Claude Code version counts as too old instead of passing, and `init` warns
+  when a `CLAUDE.md` or `.claude/CLAUDE.md` hides `AGENTS.md`. Regenerate existing hooks with
+  `etymd gates --yes` to apply the change.
+
+## 0.19.1
+
+### Patch Changes
+
+- 51ecbc9: Generated pre-push hooks shellcheck every commit in the pushed range, each materialised from
+  git's object store, instead of reading the working tree. A push whose tip is clean but whose
+  earlier commits carry a broken script is now refused; the working tree no longer substitutes
+  for the pushed bytes; a push that creates a branch checks every commit no remote already has;
+  and a commit that cannot be materialised refuses the push rather than passing as unread.
+  Regenerate existing hooks with `etymd gates --yes` to apply the correction.
+
 ## 0.19.0
 
 ### Minor Changes

package/dist/{approve-Y36ZO6IL.js → approve-Z4NMEGDM.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { section, theme, print, renderBaselineDrift, glyph } from './chunk-HI7NWPRA.js';
-import { scanProject } from './chunk-DLHC7QON.js';
-import { VERSION } from './chunk-L4KIIKXI.js';
+import { scanProject } from './chunk-OKHNNWOV.js';
+import { VERSION } from './chunk-W6GGG4LG.js';
 import { readBaseline, summarizeBaselineDrift, isDriftEmpty, writeBaseline, deriveProfile } from './chunk-P6ATKV2R.js';
-import { PACK_VERSION } from './chunk-U7BCBJIH.js';
+import { PACK_VERSION } from './chunk-6FT7KSKU.js';
 import './chunk-4VPBP6K6.js';
 
 // src/commands/approve.ts

package/dist/audit-4PGVS2TW.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+export { run } from './chunk-WYJFZ2MB.js';
+import './chunk-FG5XKFR2.js';
+import './chunk-DWPMANIC.js';
+import './chunk-3E2IPCRY.js';
+import './chunk-HI7NWPRA.js';
+import './chunk-OKHNNWOV.js';
+import './chunk-W6GGG4LG.js';
+import './chunk-P6ATKV2R.js';
+import './chunk-6FT7KSKU.js';
+import './chunk-4VPBP6K6.js';

package/dist/{brief-ILB6RMSQ.js → brief-2N6X3CFR.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { print, theme } from './chunk-HI7NWPRA.js';
-import { scanProject } from './chunk-DLHC7QON.js';
-import './chunk-L4KIIKXI.js';
+import { scanProject } from './chunk-OKHNNWOV.js';
+import './chunk-W6GGG4LG.js';
 import { ETYMD_DIR } from './chunk-P6ATKV2R.js';
-import './chunk-U7BCBJIH.js';
+import './chunk-6FT7KSKU.js';
 import './chunk-4VPBP6K6.js';
 import { promises } from 'fs';
 import path from 'path';

package/dist/{chunk-U7BCBJIH.js → chunk-6FT7KSKU.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 // src/pack/version.ts
-var PACK_VERSION = "14";
+var PACK_VERSION = "16";
 
 export { PACK_VERSION };

package/dist/{chunk-EYUW3UJU.js → chunk-DWPMANIC.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { expandFileGlobs } from './chunk-DLHC7QON.js';
+import { expandFileGlobs } from './chunk-OKHNNWOV.js';
 import { DEFAULT_CONFIG, CONFIG_FILE } from './chunk-P6ATKV2R.js';
 import { readText, isDirectory, matchesAnyGlob, normalizeRelPath, readJson, pathExists, git } from './chunk-4VPBP6K6.js';
 import path3 from 'path';

package/dist/{chunk-KIPD3N77.js → chunk-FG5XKFR2.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { stateFreshnessLens, rankFindings, listInstructionFiles, buildTruthEnv, emptyCounters, packageManagerUsage, checkDocRefs, listStateDocuments, loadDecisionLedger, checkDecisionRefs, checkTextClaims } from './chunk-EYUW3UJU.js';
+import { stateFreshnessLens, rankFindings, listInstructionFiles, buildTruthEnv, emptyCounters, packageManagerUsage, checkDocRefs, listStateDocuments, loadDecisionLedger, checkDecisionRefs, checkTextClaims } from './chunk-DWPMANIC.js';
 import { readLedger, reconcileLedger, writeLedger, visibleFindings } from './chunk-3E2IPCRY.js';
 import { measureContext, contextFileLabel } from './chunk-HI7NWPRA.js';
-import { scanProject } from './chunk-DLHC7QON.js';
+import { scanProject } from './chunk-OKHNNWOV.js';
 import { DEFAULT_CONFIG, ETYMD_DIR, writeCachedFacts, readBaseline, readConfig, deriveProfile, baselineCarriesMachinePath, BASELINE_FILE, CONFIG_FILE } from './chunk-P6ATKV2R.js';
-import { PACK_VERSION } from './chunk-U7BCBJIH.js';
+import { PACK_VERSION } from './chunk-6FT7KSKU.js';
 import { pathExists, readText, readJson, isCiEnvironment, isExecutable } from './chunk-4VPBP6K6.js';
 import path from 'path';
 import YAML from 'yaml';

package/dist/{chunk-DLHC7QON.js → chunk-OKHNNWOV.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { VERSION } from './chunk-L4KIIKXI.js';
-import { PACK_VERSION } from './chunk-U7BCBJIH.js';
+import { VERSION } from './chunk-W6GGG4LG.js';
+import { PACK_VERSION } from './chunk-6FT7KSKU.js';
 import { normalizeRelPath, isDirectory, pathExists, readText, readJson, git, matchesAnyGlob } from './chunk-4VPBP6K6.js';
 import path from 'path';
 import { execFile } from 'child_process';
@@ -447,8 +447,23 @@ async function detectArtifacts(root) {
   });
   return artifacts;
 }
-var ROOT_POINTER_IMPORT_RE = /^\s*@(\.\/)?AGENTS\.md\s*$/m;
-var DOT_CLAUDE_IMPORT_RE = /^\s*@\.\.\/AGENTS\.md\s*$/m;
+var ROOT_POINTER_IMPORT_RE = /^ {0,3}@(\.\/)?AGENTS\.md[ \t]*$/m;
+var DOT_CLAUDE_IMPORT_RE = /^ {0,3}@\.\.\/AGENTS\.md[ \t]*$/m;
+function withoutFencedCode(text) {
+  const kept = [];
+  let fence = null;
+  for (const line of text.split("\n")) {
+    if (fence === null) {
+      const open = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line);
+      if (open?.[1] && !(open[1][0] === "`" && open[2]?.includes("`"))) fence = open[1];
+      else kept.push(line);
+    } else {
+      const close = /^ {0,3}(`{3,}|~{3,})[ \t]*$/.exec(line)?.[1];
+      if (close && close[0] === fence[0] && close.length >= fence.length) fence = null;
+    }
+  }
+  return kept.join("\n");
+}
 var CLAUDE_AGENTS_FALLBACK_VERSION = "2.1.277";
 var pExecFile = promisify(execFile);
 var claudeVersionMemo;
@@ -457,18 +472,20 @@ function detectClaudeCodeVersion() {
   if (override !== void 0) {
     return Promise.resolve(override === "none" || override === "" ? null : override);
   }
-  claudeVersionMemo ??= pExecFile("claude", ["--version"], { timeout: 5e3 }).then(({ stdout }) => /(\d+\.\d+\.\d+)/.exec(stdout)?.[1] ?? null).catch(() => null);
+  claudeVersionMemo ??= pExecFile("claude", ["--version"], { timeout: 5e3 }).then(({ stdout }) => /(\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)(?=\s|$)/.exec(stdout)?.[1] ?? null).catch(() => null);
   return claudeVersionMemo;
 }
-function versionBefore(a, b) {
-  const pa = a.split(".").map(Number);
-  const pb = b.split(".").map(Number);
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const x = pa[i] ?? 0;
-    const y = pb[i] ?? 0;
+function mayPredate(a, b) {
+  const parse = (v) => /^(\d+)\.(\d+)\.(\d+)(-[0-9A-Za-z.-]+)?$/.exec(v.trim());
+  const pa = parse(a);
+  const pb = parse(b);
+  if (!pa || !pb) return true;
+  for (let i = 1; i <= 3; i++) {
+    const x = Number(pa[i]);
+    const y = Number(pb[i]);
     if (x !== y) return x < y;
   }
-  return false;
+  return pa[4] !== void 0 && pb[4] === void 0;
 }
 async function checkClaudePointer(root, claudeVersion) {
   const agentsAbs = path.join(root, "AGENTS.md");
@@ -486,11 +503,11 @@ async function checkClaudePointer(root, claudeVersion) {
     return { ok: true, via: "same-file" };
   }
   const rootClaude = await readText(claudeAbs);
-  if (rootClaude !== null && ROOT_POINTER_IMPORT_RE.test(rootClaude)) {
+  if (rootClaude !== null && ROOT_POINTER_IMPORT_RE.test(withoutFencedCode(rootClaude))) {
     return { ok: true, via: "root-import" };
   }
   const dotClaude = await readText(path.join(root, ".claude", "CLAUDE.md"));
-  if (dotClaude !== null && DOT_CLAUDE_IMPORT_RE.test(dotClaude)) {
+  if (dotClaude !== null && DOT_CLAUDE_IMPORT_RE.test(withoutFencedCode(dotClaude))) {
     return { ok: true, via: "dotclaude-import" };
   }
   if (rootClaude !== null || dotClaude !== null) {
@@ -501,7 +518,7 @@ async function checkClaudePointer(root, claudeVersion) {
     };
   }
   const version = claudeVersion === void 0 ? await detectClaudeCodeVersion() : claudeVersion;
-  if (version !== null && versionBefore(version, CLAUDE_AGENTS_FALLBACK_VERSION)) {
+  if (version !== null && mayPredate(version, CLAUDE_AGENTS_FALLBACK_VERSION)) {
     return {
       ok: false,
       kind: "old-reader",

package/dist/{chunk-EZRK4MV3.js → chunk-TZGRV7UY.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { isSafeGateCommand, generateAgentsMd, generateClaudePointerMd, isSelfBuildRepo, generatePreCommitHook, generateCommitMsgHook, generatePrePushHook, generateShellDiscoveryScript, generateArtifactCheckScript, fileOrigin } from './chunk-HSRHOVII.js';
+import { isSafeGateCommand, generateAgentsMd, generateClaudePointerMd, isSelfBuildRepo, generatePreCommitHook, generateCommitMsgHook, generatePrePushHook, generateShellDiscoveryScript, generateArtifactCheckScript, fileOrigin } from './chunk-X5GR2EJK.js';
 import { DEFAULT_CONFIG } from './chunk-P6ATKV2R.js';
 import { readText, pathExists } from './chunk-4VPBP6K6.js';
 import path from 'path';

package/dist/{chunk-L4KIIKXI.js → chunk-W6GGG4LG.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // package.json
 var package_default = {
-  version: "0.19.0"};
+  version: "0.19.2"};
 
 // src/version.ts
 var VERSION = package_default.version;

package/dist/{chunk-ZCOIZVSM.js → chunk-WIBN7PBH.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { runAudit } from './chunk-KIPD3N77.js';
+import { runAudit } from './chunk-FG5XKFR2.js';
 import { readLedger } from './chunk-3E2IPCRY.js';
-import { checkClaudePointer, CLAUDE_AGENTS_FALLBACK_VERSION } from './chunk-DLHC7QON.js';
+import { checkClaudePointer, CLAUDE_AGENTS_FALLBACK_VERSION } from './chunk-OKHNNWOV.js';
 import { DEFAULT_CONFIG, ETYMD_DIR } from './chunk-P6ATKV2R.js';
 import { readText, isDirectory, git, pathExists } from './chunk-4VPBP6K6.js';
 import os from 'os';
@@ -1006,8 +1006,8 @@ async function checkGuardedEmails(manifest, findings, disclosures) {
   }
 }
 async function checkGateDrift(manifest, findings, disclosures) {
-  const { planWorkflow } = await import('./generate-6IPTCLYG.js');
-  const { scanProject } = await import('./scan-V53PGAQ6.js');
+  const { planWorkflow } = await import('./generate-S5KGZIIM.js');
+  const { scanProject } = await import('./scan-M7STYIYQ.js');
   const { readConfig } = await import('./config-724Y3IOB.js');
   for (const entry of manifest.entries) {
     const root = entry.resolvedRoot;

package/dist/{chunk-4IESOWHQ.js → chunk-WYJFZ2MB.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { runAudit } from './chunk-KIPD3N77.js';
-import { parseFailOnTier, meetsFailOn } from './chunk-EYUW3UJU.js';
+import { runAudit } from './chunk-FG5XKFR2.js';
+import { parseFailOnTier, meetsFailOn } from './chunk-DWPMANIC.js';
 import { print, section, theme, renderLensCoverage, renderFindings, renderLedgerDiff } from './chunk-HI7NWPRA.js';
 
 // src/commands/audit.ts

package/dist/{chunk-HSRHOVII.js → chunk-X5GR2EJK.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { PACK_VERSION } from './chunk-U7BCBJIH.js';
+import { PACK_VERSION } from './chunk-6FT7KSKU.js';
 import { createHash } from 'crypto';
 
 var GENERATION_MARKER_RE = /^(?:# |<!-- )etymd:generated pack-v\S+ ([0-9a-f]{16})(?: -->)?$/;
@@ -161,15 +161,21 @@ function contentScreenCall(opts) {
     `${indent}fi`
   ].join("\n");
 }
-function localHookCall(hook) {
+function localHookCall(hook, feedRefs = false) {
+  const refsCapture = feedRefs ? `# git hands the pushed refs to pre-push ONCE, on stdin \u2014 one line per ref:
+# "<local ref> <local sha> <remote ref> <remote sha>". The shell gate below reads them too, so
+# they are captured here and fed to each.
+refs=$(cat)
+` : "";
+  const call = feedRefs ? `printf '%s\\n' "$refs" | "$LOCAL" "$@" || exit 1` : `"$LOCAL" "$@" || exit 1`;
   return `# Repo-owned checks. This file is generated and will be overwritten; \`.githooks/${hook}.local\`
 # is yours \u2014 etymd never reads, writes, or regenerates it. Put project-specific guards there.
 # A guard running tests that build fixture repositories should scrub git's exported GIT_* names
 # first \u2014 a child git inherits them and ignores its cwd, so the suite would hit the real repo:
 #   env $(env | grep -o '^GIT_[A-Za-z0-9_]*' | sed 's/^/-u /') <your command>
 LOCAL="$(dirname "$0")/${hook}.local"
-if [ -x "$LOCAL" ]; then
-  "$LOCAL" "$@" || exit 1
+${refsCapture}if [ -x "$LOCAL" ]; then
+  ${call}
 fi`;
 }
 function generatePreCommitHook(selfBuild = false) {
@@ -178,10 +184,10 @@ function generatePreCommitHook(selfBuild = false) {
 
 ${localHookCall("pre-commit")}
 
-# Content screen \u2014 staged file bytes. Refuses to commit environment, guarded-side or identity
-# detail into a repo whose history is (or could become) public. The checker and its patterns
-# are machine-local by design, so this is a NO-OP wherever no checker is installed: safe to
-# commit anywhere, active only where you opted in.
+# Content screen \u2014 staged file bytes. Refuses to commit detail about your environment, work
+# or identity into a repo whose history is (or could become) public. The checker and its
+# patterns are machine-local by design, so this is a NO-OP wherever no checker is installed:
+# safe to commit anywhere, active only where you opted in.
 #
 # Bypass, with a reason: git commit --no-verify
 ${contentGateResolution(selfBuild)}
@@ -256,17 +262,18 @@ function generateShellDiscoveryScript() {
 # side, positional here). Verdicts land in the scratch: scripts (NUL-delimited matches) and one
 # dot per decision into count / zsh-count / skip-count, tallied by the hook after the pipeline.
 #
-# A path with nothing readable behind it \u2014 a submodule entry, a dangling symlink, a file
-# deleted from the worktree while still tracked \u2014 cannot lie about its contents, so it is a
-# disclosed skip, never a block: an absent worktree file is routine dirty state. A regular file
+# The hook runs it from inside a commit materialised from git's object store, so paths resolve
+# against that tree, never the working tree. A path with nothing readable behind it \u2014 a
+# submodule entry, a dangling symlink \u2014 cannot lie about its contents, so it is a disclosed
+# skip, never a block. A regular file
 # that EXISTS but cannot be read is the other branch \u2014 coverage would silently shrink, so it
 # fails, naming the path.
 #
-# The two \`[ "$?" -eq 1 ]\` guards are the match/error protocol: grep reports "no match" as 1
-# and a failure as 2 or more, and only the first is a verdict. Dropping the guard would let a
-# failing matcher pass as "not a shell script" \u2014 the exact silent coverage-shrink the
-# fail-closed rules exist to prevent. The checker does not associate \`$?\` with the enclosing
-# if-condition, which is why this shape survives the pass it serves; keep it that way.
+# The match/error protocol: grep reports "no match" as 1 and a failure as 2 or more, and only
+# the first is a verdict. Letting a failure fall through would pass a broken matcher as "not a
+# shell script" \u2014 the exact silent coverage-shrink the fail-closed rules exist to prevent. The
+# status is captured on the grep's own line (\`|| st=$?\`), so no command added later can come
+# between the grep and the check and silently replace the status being read.
 work=$1
 shift
 for file do
@@ -282,33 +289,42 @@ for file do
     exit 1
   }
   head -n 1 "$work/head-bytes" > "$work/first-line" || exit 1
-  if grep -qE "^#!.*[/ ](ba|da)?sh( |$)" "$work/first-line"; then
-    printf "./%s\\0" "$file" >> "$work/scripts" || exit 1
-    printf . >> "$work/count" || exit 1
-  else
-    [ "$?" -eq 1 ] || exit 1
-    if grep -qE "^#!.*[/ ]zsh( |$)" "$work/first-line"; then
-      printf . >> "$work/zsh-count" || exit 1
-    else
-      [ "$?" -eq 1 ] || exit 1
-    fi
-  fi
+  st=0
+  grep -qE "^#!.*[/ ](ba|da)?sh( |$)" "$work/first-line" || st=$?
+  case $st in
+    (0)
+      printf "./%s\\0" "$file" >> "$work/scripts" || exit 1
+      printf . >> "$work/count" || exit 1 ;;
+    (1)
+      st=0
+      grep -qE "^#!.*[/ ]zsh( |$)" "$work/first-line" || st=$?
+      case $st in
+        (0) printf . >> "$work/zsh-count" || exit 1 ;;
+        (1) ;;
+        (*) exit 1 ;;
+      esac ;;
+    (*) exit 1 ;;
+  esac
 done
 `);
 }
 function shellcheckStep() {
   return `
 # Shell correctness. Scripts are discovered by shebang over TRACKED files at push time, so a
-# script added later is covered without regenerating this hook. The classifier is
-# discover-shell-scripts.sh beside this hook \u2014 tracked and shebanged like what it classifies,
+# script added later is covered without regenerating this hook. The commits BEING PUSHED are
+# the bytes that ship, so each one is materialised from git's object store and checked there \u2014
+# never the working tree (wrong in both directions: a fixed tree let an unfixed commit ship, and
+# a dirty tree shared by several sessions blocked an unrelated push) and never the tip alone (a
+# bad commit under a clean tip shipped while the gate read only the tip's fix). The classifier
+# is discover-shell-scripts.sh beside this hook \u2014 tracked and shebanged like what it classifies,
 # so the scan it implements finds and checks it too. zsh is NOT in the checked set:
 # the checker cannot parse it (SC1071 is a parser-level error no inline directive can silence),
 # so checking it would fail every push on the parser, not on the script. Excluded \u2014 and said so
 # at run time below, because a coverage hole that is silent is indistinguishable from coverage.
 # The same honesty splits the unreadable: a regular file that exists but cannot be read blocks
 # the push (coverage would otherwise silently shrink), while a tracked path with nothing readable
-# behind it \u2014 a submodule entry, a dangling symlink, a file deleted from the worktree while
-# still tracked \u2014 is counted and said so below as skipped, never a block.
+# behind it \u2014 a submodule entry, a dangling symlink \u2014 is counted and said so below as skipped,
+# never a block.
 #
 # "the checker", not its name, on purpose: a comment whose first word is that name is read as
 # a DIRECTIVE, and an unparseable directive is itself an error (SC1072/SC1073). A hook that
@@ -327,39 +343,143 @@ if command -v shellcheck >/dev/null 2>&1; then
     shellcheck_tmp=$(mktemp -d) || exit 1
     trap 'rm -rf "$shellcheck_tmp"' 0
     trap 'exit 1' 1 2 3 15
-    git ls-files -z > "$shellcheck_tmp/tracked" || {
-      echo "etymd: cannot enumerate tracked files for shellcheck" >&2
+    # Every commit in each pushed range, never the tip alone: pushing two commits \u2014 a bad
+    # script, then its fix \u2014 passed a tip-only read while the bad commit landed on the remote.
+    # An all-zero local sha is a delete (nothing to check). An all-zero REMOTE sha is a new
+    # branch: everything no remote already has is being pushed, so the range is the local sha
+    # minus every remote-tracking ref \u2014 commits a remote already received were gated when they
+    # landed there, and the residue is exactly this push's new commits. A remote sha this clone
+    # has never seen (the remote moved on since the last fetch) cannot bound a range, so it takes
+    # the same new-branch rule instead of refusing a push the gate could have read. Enumeration
+    # failure refuses the push: a range the gate could not list is a range it did not read.
+    # (pattern) with both parens: bash 3.2 (macOS /bin/sh) cannot parse an unbalanced )
+    # in a case pattern.
+    : > "$shellcheck_tmp/shas" || exit 1
+    printf '%s\\n' "$refs" | while read -r _lref lsha _rref rsha; do
+      case "$lsha" in
+        (*[!0]*) ;;
+        (*) continue ;;
+      esac
+      case "$rsha" in
+        (*[!0]*)
+          if git cat-file -e "\${rsha}^{commit}" 2>/dev/null; then
+            git rev-list "$rsha..$lsha"
+          else
+            git rev-list "$lsha" --not --remotes
+          fi ;;
+        (*) git rev-list "$lsha" --not --remotes ;;
+      esac >> "$shellcheck_tmp/shas" || exit 1
+    done || {
+      echo "etymd: could not enumerate the commits being pushed for shellcheck" >&2
       exit 1
     }
-    : > "$shellcheck_tmp/scripts" && : > "$shellcheck_tmp/count" && : > "$shellcheck_tmp/zsh-count" && : > "$shellcheck_tmp/skip-count" || exit 1
-    xargs -0 "$(dirname "$0")/discover-shell-scripts.sh" "$shellcheck_tmp" < "$shellcheck_tmp/tracked" || {
-      echo "etymd: shell script discovery failed; shellcheck coverage is incomplete" >&2
-      exit 1
-    }
-    count=$(wc -c < "$shellcheck_tmp/count") || exit 1
-    zsh_count=$(wc -c < "$shellcheck_tmp/zsh-count") || exit 1
-    skip_count=$(wc -c < "$shellcheck_tmp/skip-count") || exit 1
-    if [ "$skip_count" -gt 0 ]; then
-      echo "\u203A shellcheck: $((skip_count)) tracked path(s) with nothing readable behind them (submodule, dangling symlink, or deleted from the worktree) \u2014 not checked, not failed"
-    fi
-    if [ "$zsh_count" -gt 0 ]; then
-      echo "\u203A shellcheck: $((zsh_count)) zsh script(s) excluded \u2014 shellcheck cannot parse zsh (SC1071); not checked, not failed"
+    shas=$(sort -u "$shellcheck_tmp/shas") || exit 1
+    if [ -n "$shas" ]; then
+      # Said up front: a first push from a fresh clone can carry the whole history, and a long
+      # silent hook reads as a hung one.
+      echo "\u203A shellcheck: $(printf '%s\\n' "$shas" | wc -l | tr -d ' ') commit(s) in the pushed range"
+    else
+      echo "\u203A shellcheck: no commit in the pushed refs (deletes only, or nothing on stdin) \u2014 nothing to check"
     fi
-    if [ "$count" -gt 0 ]; then
-      echo "\u203A shellcheck ($((count)) scripts, blocking at severity=warning)"
-      xargs -0 shellcheck -S warning -- < "$shellcheck_tmp/scripts" || {
-        echo "  fix, or justify inline with '# shellcheck disable=SCxxxx  # why'"
+    # Resolved once, before any cd: the classifier runs inside each materialised tree, and a
+    # relative hook path would no longer point at it from there.
+    discover="$(cd "$(dirname "$0")" && pwd)/discover-shell-scripts.sh" || exit 1
+    for sha in $shas; do
+      # A fresh directory per commit, removed once that commit is checked so a long push does
+      # not pile up one full tree per commit; the subshell trap above still cleans the root on
+      # every early exit.
+      tree=$(mktemp -d "$shellcheck_tmp/commit.XXXXXX") || exit 1
+      # Checked out through a scratch index, never \`git archive\`: archive honours the
+      # export-ignore and export-subst attributes, so a script marked export-ignore would leave
+      # the checked set without a word. read-tree + checkout-index writes every tracked blob.
+      # Large-file pointers stay pointers \u2014 they are never shell, and a push must not need the
+      # network to be checked.
+      if ! git cat-file -e "\${sha}^{commit}" 2>/dev/null \\
+         || ! GIT_INDEX_FILE="$shellcheck_tmp/index" git read-tree "$sha" 2>/dev/null \\
+         || ! GIT_INDEX_FILE="$shellcheck_tmp/index" GIT_LFS_SKIP_SMUDGE=1 \\
+              git checkout-index -a -f --prefix="$tree/" 2>/dev/null; then
+        echo "\u2717 shellcheck: could not materialise $(git rev-parse --short "$sha" 2>/dev/null || echo "$sha") \u2014 refusing the push rather than certifying bytes this gate did not read" >&2
+        exit 1
+      fi
+      if [ -n "$(git ls-tree -r --name-only "$sha")" ] && [ -z "$(ls -A "$tree")" ]; then
+        echo "\u2717 shellcheck: $(git rev-parse --short "$sha" 2>/dev/null || echo "$sha") extracted to an empty tree \u2014 refusing the push" >&2
+        exit 1
+      fi
+      : > "$shellcheck_tmp/scripts" && : > "$shellcheck_tmp/count" && : > "$shellcheck_tmp/zsh-count" && : > "$shellcheck_tmp/skip-count" || exit 1
+      # Only the paths this commit adds, copies, modifies, renames or retypes against its first
+      # parent. A script the commit did not touch has its parent's bytes, and that parent was
+      # either gated when it reached the remote or sits in this range and is checked here; a
+      # merge diffed against its first parent brings in everything the other side added.
+      # Checking every script in every commit multiplied the cost by the range length, so a long
+      # push of a script-heavy repo ran long enough to look hung. Two changes alter the verdict
+      # on bytes nobody touched \u2014 the classifier deciding what is a script, and a .shellcheckrc
+      # deciding what is a finding \u2014 so a commit that touches either, deletion included (a
+      # removed .shellcheckrc re-enables every check it disabled), is checked whole. So is a
+      # commit that adds or changes this hook: a repo adopting the gate after the fact has
+      # scripts no gate ever read, and the commit installing it is where they get read once.
+      short=$(git rev-parse --short "$sha" 2>/dev/null || echo "$sha")
+      if git rev-parse -q --verify "\${sha}^1^{commit}" >/dev/null 2>&1; then
+        git diff-tree -r -z --name-only --no-commit-id "\${sha}^1" "$sha" > "$shellcheck_tmp/touched" \\
+          && git diff-tree -r -z --name-only --no-commit-id --diff-filter=ACMRT "\${sha}^1" "$sha" > "$shellcheck_tmp/tracked"
+      else
+        git diff-tree -r -z --name-only --no-commit-id --root "$sha" > "$shellcheck_tmp/touched" \\
+          && cp "$shellcheck_tmp/touched" "$shellcheck_tmp/tracked"
+      fi || {
+        echo "etymd: cannot enumerate the paths $short changes for shellcheck" >&2
+        exit 1
+      }
+      where="changed in $short"
+      # Through a file, not a pipe: a pipeline reports only grep's status, and a failing tr would
+      # hand grep nothing \u2014 a "no match" that silently takes the narrow path.
+      tr '\\000' '\\n' < "$shellcheck_tmp/touched" > "$shellcheck_tmp/touched-lines" || exit 1
+      # grep: 1 is "no match", a verdict; anything higher is the matcher failing. The status is
+      # taken on the grep's own line so nothing added later can come between them.
+      st=0
+      grep -qE '(^|/)(\\.shellcheckrc|discover-shell-scripts\\.sh|pre-push)$' "$shellcheck_tmp/touched-lines" || st=$?
+      case $st in
+        (0)
+          where="in $short (whole tree: the gate, its classifier or a .shellcheckrc changed)"
+          git ls-tree -r -z --name-only "$sha" > "$shellcheck_tmp/tracked" || {
+            echo "etymd: cannot enumerate the tree of $short for shellcheck" >&2
+            exit 1
+          } ;;
+        (1) ;;
+        (*)
+          echo "etymd: shell script discovery failed; cannot tell whether $short changes the gate, its classifier or a .shellcheckrc" >&2
+          exit 1 ;;
+      esac
+      ( cd "$tree" && xargs -0 "$discover" "$shellcheck_tmp" ) < "$shellcheck_tmp/tracked" || {
+        echo "etymd: shell script discovery failed; shellcheck coverage is incomplete" >&2
         exit 1
       }
-      # Everything below the blocking bar, shown once the push is already cleared. Never affects
-      # the exit code \u2014 advice that can fail a push is not advice.
-      advice=$(xargs -0 shellcheck -S style -f gcc -- < "$shellcheck_tmp/scripts" 2>/dev/null \\
-        | grep -v ': warning:\\|: error:' || true)
-      if [ -n "$advice" ]; then
-        echo "  \xB7 style/info (not blocking):"
-        printf '%s\\n' "$advice" | sed 's/^/    /'
+      count=$(wc -c < "$shellcheck_tmp/count") || exit 1
+      zsh_count=$(wc -c < "$shellcheck_tmp/zsh-count") || exit 1
+      skip_count=$(wc -c < "$shellcheck_tmp/skip-count") || exit 1
+      if [ "$skip_count" -gt 0 ]; then
+        echo "\u203A shellcheck: $((skip_count)) tracked path(s) with nothing readable behind them (submodule or dangling symlink) \u2014 not checked, not failed"
       fi
-    fi
+      if [ "$zsh_count" -gt 0 ]; then
+        echo "\u203A shellcheck: $((zsh_count)) zsh script(s) excluded \u2014 shellcheck cannot parse zsh (SC1071); not checked, not failed"
+      fi
+      if [ "$count" -eq 0 ]; then
+        echo "\u203A shellcheck: no shell script $where \u2014 nothing to check there"
+      else
+        echo "\u203A shellcheck ($((count)) scripts $where, blocking at severity=warning)"
+        ( cd "$tree" && xargs -0 shellcheck -S warning -- < "$shellcheck_tmp/scripts" ) || {
+          echo "  fix, or justify inline with '# shellcheck disable=SCxxxx  # why'"
+          exit 1
+        }
+        # Everything below the blocking bar, shown once the push is already cleared. Never affects
+        # the exit code \u2014 advice that can fail a push is not advice.
+        advice=$( ( cd "$tree" && xargs -0 shellcheck -S style -f gcc -- < "$shellcheck_tmp/scripts" 2>/dev/null ) \\
+          | grep -v ': warning:\\|: error:' || true)
+        if [ -n "$advice" ]; then
+          echo "  \xB7 style/info (not blocking):"
+          printf '%s\\n' "$advice" | sed 's/^/    /'
+        fi
+      fi
+      rm -rf "$tree" || exit 1
+    done
   ) || exit 1
 else
   echo "\u203A shellcheck skipped (not on PATH) \u2014 install it to gate this repo's shell scripts"
@@ -401,7 +521,7 @@ fi`;
   return stampGenerated(`#!/usr/bin/env sh
 # etymd: correctness gate. Mirrors CI cheapest-first; blocks the push on any failure.
 
-${localHookCall("pre-push")}${runner}
+${localHookCall("pre-push", true)}${runner}
 ${body}${shellStep}
 ${auditStep}