@rmyndharis/aimhooman 0.2.0 → 0.3.0

package/docs/design/frictionless-enforcement.md

@@ -2,19 +2,23 @@
 
 This document describes aimhooman's enforcement model. aimhooman is designed to
 prevent known AI-tool residue from leaking into Git history **without editing
-`.gitignore`, and with repair before rejection on the default ordinary commit path.**
-Plugin startup provides best-effort prevention without `init`; complete Git-boundary
-enforcement requires local or global hook setup.
+`.gitignore` by default, and with repair before rejection on the default ordinary
+commit path.** Plugin startup provides best-effort prevention without `init`;
+complete Git-boundary enforcement requires local or global hook setup.
 
 ## Goals
 
 - **Zero-activation for Claude Code:** the plugin is active every session
   (SessionStart), no `init`.
-- **No `.gitignore` burden:** known AI artifacts are auto-excluded via
-  `.git/info/exclude` (local, never committed, never the user's `.gitignore`).
+- **No `.gitignore` burden by default:** known AI artifacts are auto-excluded via
+  `.git/info/exclude` (local, never committed). `init --gitignore` is the opt-in
+  variant that writes the same managed block to the worktree `.gitignore`, so a
+  team can commit it and share the ignore set across clones.
 - **Repair-first for hygiene by default:** AI artifacts are excluded before
-  staging or unstaged at commit. If a block cannot be repaired, remains in the
-  pinned tree, or cannot be scanned completely, the operation stops.
+  staging or unstaged at commit. If a block cannot be repaired or remains in the
+  pinned tree, the operation stops. An incomplete scan warns on
+  `clean`/`compliance` and stops on `strict`; the final ref guard stops on it
+  at every profile.
 - **Broad, community-updatable rule catalog:** covers many AI tools; extendable
   via PR (core) and local rules (personal).
 - **Block remains available as opt-in** (`strict` profile) for teams that want
@@ -41,8 +45,9 @@ enforcement requires local or global hook setup.
 3. **PreToolUse cannot unstage.** It runs before the tool executes; at `git add X`,
    X is not staged yet. So unstage is a git-tier (`pre-commit`) capability; the
    plugin tier does prevention (excludes) plus advisory (warn).
-4. **`.gitignore` stays clean** because aimhooman writes `.git/info/exclude`
-   (local, not committed, not `.gitignore`).
+4. **`.gitignore` stays clean by default** because aimhooman writes
+   `.git/info/exclude` (local, not committed). The opt-in `init --gitignore`
+   writes the same managed block to `.gitignore` for teams that want it committed.
 
 ## Design
 
@@ -54,16 +59,18 @@ enforcement requires local or global hook setup.
 | 1. Catch-all | `pre-commit` hook unstages AI artifacts from the index | git hook | proceeds after repair; stops if repair fails |
 | 2. Agent guard | PreToolUse reports paths and rejects unprovable protected Git mutations | plugin | advisory for paths; fail-closed for boundary bypass |
 | 3. Strict policy | `strict` profile blocks instead of repairing (exit 10) | both | block |
-| 4. Pinned tree | `commit-msg` checks the exact would-be tree and message | git hook | blocks a remaining violation or incomplete scan |
+| 4. Pinned tree | `commit-msg` checks the exact would-be tree and message | git hook | blocks a remaining violation; an incomplete scan warns on clean/compliance, stops on strict |
 | 5. Final ref check | prepared `reference-transaction` scans what each commit introduced to `HEAD` or a branch changes (and the message of commits authored locally) | git hook | blocks a violation or incomplete scan |
 
 Default profile `clean` uses layers 0, 1, 2, 4, and 5. Successful repair keeps the
 ordinary path low-friction. The pinned-tree and final-ref scans deliberately stop if
-a block remains on a path the commit actually changes, or if any scan is incomplete.
+a block remains on a path the commit actually changes. The final-ref scan also stops
+when it is incomplete, on every profile; an incomplete pinned-tree scan warns on
+`clean`/`compliance` and stops on `strict`.
 A file already in history is not re-tried on every later commit: the final ref check
 judges a commit by its change set, so an inherited path no longer blocks unrelated
 work. Use `aimhooman check --tracked` (or scan the PR range in CI) to surface legacy
-secrets without bricking the branch.
+artifacts without bricking the branch.
 Git 2.54 also emits an earlier `preparing` reference-transaction callback. The
 hook checks dispatcher integrity there without scanning unresolved references,
 then keeps the scan veto at `prepared`, after Git has locked them.
@@ -95,14 +102,15 @@ rather than run the command on its own, which is the friction this tier exists t
 ### Components
 
 1. **Rule catalog** — `rules/paths.json`, `rules/attribution.json`,
-   `rules/markers.json`, `rules/secrets.json`. Covers Claude, Codex, Copilot, Cursor, Aider, SpecStory,
+   `rules/markers.json`. Covers Claude, Codex, Copilot, Cursor, Aider, SpecStory,
    Continue, Playwright MCP, Remember, Superpowers, and a generic agent dir.
    Community extends via PR (core); personal extensions via
    `<common-git-dir>/aimhooman/rules/*.json` (local, shared by linked worktrees,
    loaded after core, and only able to add restrictions).
 2. **Auto-exclude** — `applyExclude` writes patterns derived from unambiguous
    `ephemeral-state` and `local-settings` rules to `.git/info/exclude` from
-   SessionStart, init, and the agent guard. Secrets and review paths remain visible.
+   SessionStart, init, and the agent guard. Review-required and policy paths
+   remain visible.
 3. **Git boundary** — the `pre-commit` hook scans staged paths; for any AI
    artifact it removes it from the index, then lets the commit proceed only when
    that repair succeeds. `commit-msg` removes complete exact high-confidence attribution lines
@@ -133,8 +141,10 @@ means local rules only add restrictions and can never override a core block.
 ## Implementation notes
 
 - **Category-aware failure.** On `clean`, a malformed local rule pack is skipped
-  with a warning because built-in rules remain active. Corrupt override state,
-  unreadable Git inputs, and incomplete staged-content scans stop every profile.
+  with a warning because built-in rules remain active. Corrupt override state and
+  unreadable Git inputs stop every profile. An incomplete staged-content scan warns
+  on `clean`/`compliance` and stops `strict`; the final ref guard fails closed on it
+  at every profile.
   Any automatic unstage failure stops; allowing it through would only defer the
   same block to the pinned-tree or final-ref scan. `strict` also vetoes policy
   findings and reviews.
@@ -146,7 +156,7 @@ means local rules only add restrictions and can never override a core block.
 - **HEAD-safe unstage.** `git restore --staged` needs HEAD; on a repository's
   initial commit it falls back to `git rm --cached --ignore-unmatch`.
 - **Repair never mints an empty commit.** When the pre-commit repair unstages the last
-  staged path (stage only a `.env`, then `git commit`), it exits 10 so Git stops, the
+  staged path (stage only a `.claude.json`, then `git commit`), it exits 10 so Git stops, the
   same outcome as committing with nothing staged. Carrying on would create a commit Git
   itself would have refused and leave the developer a junk commit to `git reset --hard`.
 - **Anchored attribution rules.** The AI-noreply rule is anchored to trailer

package/hooks/hooks.json

@@ -1,5 +1,5 @@
 {
-    "description": "aimhooman: keep AI session files, secrets, and attribution out of commits",
+    "description": "aimhooman: keep AI session files and attribution out of commits",
     "hooks": {
         "SessionStart": [
             {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rmyndharis/aimhooman",
-    "version": "0.2.0",
-    "description": "AI works. Hoomans ship. Keep AI session files, secrets, and attribution out of your commits.",
+    "version": "0.3.0",
+    "description": "AI works. Hoomans ship. Keep AI session files and attribution out of your commits.",
     "homepage": "https://github.com/rmyndharis/aimhooman#readme",
     "repository": {
         "type": "git",
@@ -21,6 +21,8 @@
         "hooks/",
         "schemas/",
         "docs/hosts.json",
+        "docs/ai-artifacts.gitignore",
+        "docs/catalog.md",
         "docs/design/",
         "docs/logo/",
         ".claude-plugin/",
@@ -47,6 +49,7 @@
         "check": "node scripts/validate.mjs",
         "sync:hosts": "node scripts/sync-hosts.mjs",
         "sync:ruleset": "node scripts/sync-ruleset.mjs",
+        "sync:catalog": "node scripts/sync-catalog.mjs",
         "test": "node --import ./tests/test-env.mjs --test",
         "test:coverage": "node --import ./tests/test-env.mjs --experimental-test-coverage --test-coverage-include=\"src/**\" --test-coverage-include=\"bin/**\" --test-coverage-include=\"scripts/authorize-owner-paths.mjs\" --test-coverage-include=\"scripts/github-owner-authority.mjs\" --test-coverage-include=\"scripts/package-manifest.mjs\" --test-coverage-include=\"scripts/scan-ci-history.mjs\" --test-coverage-exclude=\"tests/**\" --test-coverage-lines=75 --test-coverage-branches=60 --test-coverage-functions=85 --test-reporter=spec --test-reporter=./scripts/coverage-threshold.mjs --test-reporter-destination=stdout --test-reporter-destination=stderr --test",
         "check:static": "node scripts/static-gates.mjs",

package/rules/paths.json

@@ -216,120 +216,6 @@
             "git restore --staged <path>"
         ]
     },
-    {
-        "id": "secret.dotenv",
-        "version": 4,
-        "provider": "generic",
-        "category": "secret",
-        "confidence": "high",
-        "kind": "path",
-        "match": {
-            "path_case": "insensitive",
-            "paths": [
-                ".env",
-                "**/.env",
-                ".env.*",
-                "**/.env.*"
-            ],
-            "except": [
-                "**/*.example",
-                "**/*.sample",
-                "**/*.template",
-                "**/*.dist",
-                "**/*.defaults",
-                "**/*.minimal"
-            ]
-        },
-        "actions": {
-            "clean": "block",
-            "strict": "block",
-            "compliance": "block"
-        },
-        "reason": "Environment files often carry secrets and should not be committed.",
-        "remediation": [
-            "git restore --staged <path>",
-            "commit a .env.example with placeholders instead"
-        ]
-    },
-    {
-        "id": "secret.private-key",
-        "version": 3,
-        "provider": "generic",
-        "category": "secret",
-        "confidence": "high",
-        "kind": "path",
-        "match": {
-            "path_case": "insensitive",
-            "paths": [
-                "**/id_rsa",
-                "**/id_dsa",
-                "**/id_ecdsa",
-                "**/id_ed25519",
-                "**/*.p12",
-                "**/*.pfx"
-            ]
-        },
-        "actions": {
-            "clean": "block",
-            "strict": "block",
-            "compliance": "block"
-        },
-        "reason": "A path matching a private-key filename (id_rsa, id_ed25519, *.p12, *.pfx, ...) is blocked by name — content is not inspected. If this is a real key, it must never be committed; if the name is coincidental, rename the file.",
-        "remediation": [
-            "git restore --staged <path>",
-            "if this is a real key, rotate it if it was ever exposed",
-            "if the name is coincidental (a fixture, a doc), rename the file so it no longer matches a private-key pattern"
-        ]
-    },
-    {
-        "id": "secret.aws-credentials",
-        "version": 2,
-        "provider": "generic",
-        "category": "secret",
-        "confidence": "high",
-        "kind": "path",
-        "match": {
-            "path_case": "insensitive",
-            "paths": [
-                ".aws/credentials",
-                "**/.aws/credentials"
-            ]
-        },
-        "actions": {
-            "clean": "block",
-            "strict": "block",
-            "compliance": "block"
-        },
-        "reason": "AWS credentials must never be committed.",
-        "remediation": [
-            "git restore --staged <path>"
-        ]
-    },
-    {
-        "id": "secret.claude-credentials",
-        "version": 1,
-        "provider": "claude-code",
-        "category": "secret",
-        "confidence": "high",
-        "kind": "path",
-        "match": {
-            "path_case": "insensitive",
-            "paths": [
-                ".claude/.credentials.json",
-                "**/.claude/.credentials.json"
-            ]
-        },
-        "actions": {
-            "clean": "block",
-            "strict": "block",
-            "compliance": "block"
-        },
-        "reason": "This file holds an OAuth access token and must never be committed.",
-        "remediation": [
-            "git restore --staged <path>",
-            "Revoke the token if it already reached a commit."
-        ]
-    },
     {
         "id": "generic.agent-instructions",
         "version": 2,

package/schemas/overrides.schema.json

@@ -14,7 +14,10 @@
             "required": ["target"],
             "properties": {
                 "target": { "type": "string", "minLength": 1 },
-                "scope": { "enum": ["path", "rule", "secret-path"] },
+                "scope": {
+                    "enum": ["path", "rule"],
+                    "$comment": "v0.3.0 retired the secret-path scope with built-in secret scanning; the loader drops legacy entries with a warning instead of failing the file."
+                },
                 "reason": { "type": "string" },
                 "actor": { "type": "string" },
                 "at": { "type": "string", "format": "date-time" }

package/skills/aimhooman/SKILL.md

@@ -3,8 +3,8 @@ name: aimhooman
 description: >
   Keep AI tooling artifacts out of Git. Use whenever staging, committing, or
   pushing changes: block AI session/state files (.claude/session.json,
-  .codex/history, .copilot, .cursor/session, .aider.*, .specstory, .agent),
-  secrets (.env, private keys, .aws/credentials), and unwanted AI attribution in
+  .codex/history, .copilot, .cursor/session, .aider.*, .specstory, .agent)
+  and unwanted AI attribution in
   commit messages (Co-authored-by an AI, "Generated with AI"). Also use when the user says
   "aimhooman", "ship it like a hooman", or asks to clean AI residue before a commit.
 license: MIT
@@ -24,13 +24,16 @@ Its policy:
   `.copilot/*`, `.cursor/session*`, `.cursor/chats/*`, `.cursor/logs/*`,
   `.aider.*`, `.specstory/*`, `.continue/sessions/*`, `.playwright-mcp/*`,
   `.remember/*`, `.superpowers/*`, and `.agent/*`. The examples are not
-  exhaustive; the packaged `rules/paths.json` is the detection source of truth.
-  If one is staged, unstage it and keep it out of Git instead.
+  exhaustive; the packaged `rules/paths.json` is the detection source of truth
+  for these artifacts. If one is staged, unstage it and keep it out of Git
+  instead.
 - Never commit secrets: a real `.env` (not `.env.example`), private keys
   (`id_rsa` and files containing a private-key header), `.aws/credentials`,
   `.claude/.credentials.json`, service-account keys, or a provider API key
   (GitHub, GitLab, npm, Slack, Anthropic, OpenAI, Google, Stripe, Hugging Face,
-  SendGrid). Public certificates are allowed.
+  SendGrid). Public certificates are allowed. aimhooman does not scan for
+  secrets — this rule is on you, and a dedicated scanner such as gitleaks is
+  the right backstop for it.
 - Never add AI attribution to commit messages: no `Co-authored-by` trailer naming
   an AI (Claude, Copilot, Codex), no "Generated with/by <AI>" lines, no AI-service
   noreply emails. A commit message reads as if a human wrote it.
@@ -61,7 +64,7 @@ npm test
 npm run test:coverage
 ```
 
-aimhooman also enforces this at commit time, so a blocked commit means a real
-violation to fix, not a check to bypass. The rule is simple: AI works, hoomans
-ship.
+aimhooman also enforces the artifact and attribution rules at commit time, so
+a blocked commit means a real violation to fix, not a check to bypass. The rule
+is simple: AI works, hoomans ship.
 <!-- aimhooman:ruleset-end -->

package/src/exclude.mjs

@@ -8,8 +8,8 @@ const END = '# <<< aimhooman managed excludes';
 
 // Local AI residue kept out of `git status`. Deriving this list from the rule
 // catalog prevents the prevention layer from drifting behind enforcement. We
-// intentionally exclude only unambiguous tooling state/settings: secret and
-// review-required rules must remain visible to users.
+// intentionally exclude only unambiguous tooling state/settings: review-
+// required and policy rules must remain visible to users.
 const AUTO_EXCLUDE_CATEGORIES = new Set(['ephemeral-state', 'local-settings']);
 
 export function patternsForRules(rules) {

package/src/hook.mjs

@@ -8,6 +8,7 @@ import { newEngineWithDiagnostics } from './scan.mjs';
 import { openRepo, stagedEntries } from './gitx.mjs';
 import { applyExclude, patternsForRules } from './exclude.mjs';
 import { activeGitHook, installedHooks } from './githooks.mjs';
+import { loadConfig } from './state.mjs';
 import { visible } from './report.mjs';
 import { extractRuleset } from './ruleset-text.mjs';
 import { resolvePolicy } from './policy-resolver.mjs';
@@ -84,7 +85,14 @@ export function hookSessionStart() {
         const repo = openRepo();
         const policy = resolvePolicy(repo, { target: 'worktree' });
         const { engine: eng } = newEngineWithDiagnostics(policy.profile, repo.stateDir);
-        applyExclude(repo.excludeFile, patternsForRules(eng.rules));
+        const patterns = patternsForRules(eng.rules);
+        applyExclude(repo.excludeFile, patterns);
+        // A clone that opted into the committed variant gets the same refresh in
+        // its worktree .gitignore; every failure degrades silently, same as the
+        // exclude write above.
+        if (loadConfig(repo.stateDir).gitignore?.enabled) {
+            applyExclude(join(repo.root, '.gitignore'), patterns);
+        }
     } catch {
         /* not a repo; nothing to exclude */
     }
@@ -383,11 +391,23 @@ function hookPreToolUse(input) {
     // above so a read-only .git/info (CI checkout, read-only volume, a
     // repository owned by another user) cannot decide what is allowed.
     if (repo) {
+        const patterns = patternsForRules(eng.rules);
         try {
-            applyExclude(repo.excludeFile, patternsForRules(eng.rules));
+            applyExclude(repo.excludeFile, patterns);
         } catch (e) {
             hygieneWarning = `could not refresh ${repo.excludeFile}: ${e.message}`;
         }
+        // The committed variant of the block gets the same best-effort refresh
+        // when this clone opted into it; a failure there is housekeeping too,
+        // never part of the verdict.
+        try {
+            if (loadConfig(repo.stateDir).gitignore?.enabled) {
+                applyExclude(join(repo.root, '.gitignore'), patterns);
+            }
+        } catch (e) {
+            const gitignoreWarning = `could not refresh ${join(repo.root, '.gitignore')}: ${e.message}`;
+            hygieneWarning = hygieneWarning ? `${hygieneWarning}; ${gitignoreWarning}` : gitignoreWarning;
+        }
     }
     // A strict policy cannot make a meaningful guarantee if Git's own guards
     // are explicitly bypassed. Deny before the shell can stage-and-commit in a
@@ -402,7 +422,7 @@ function hookPreToolUse(input) {
     // A preceding command that may have changed the repository or its hooks is
     // also a potential pre-commit bypass. Strict rejects it above; clean and
     // compliance still need the staged-content backstop so a hook mutation
-    // cannot expose a secret that was already in the index.
+    // cannot sneak a blocked staged file past the guard.
     const commitPrefixRisk = parsed.commands.some((candidate) => (
         (candidate.verb === 'commit' || candidate.verb === 'unknown')
         && candidate.prefixRisk
@@ -426,8 +446,8 @@ function hookPreToolUse(input) {
     // them. A build, a test run, ls — those leave pre-commit to answer, and
     // refusing them taught agents to drop the `&&` gate rather than to run the
     // command separately. hiddenBypass stays wider on purpose; it is what keeps
-    // the staged-content backstop reading the blobs, so a secret already in the
-    // index still stops the commit here.
+    // the staged-content backstop reading the blobs, so a blocked file already
+    // in the index still stops the commit here.
     const prefixHookBypass = opaqueCommitRisk
         || (commitPrefixRisk && (noVerify || bypassHooks || parsed.prefixHooksRisk));
     // The same distinction, for the deny paths that ask "will anything scan this
@@ -460,7 +480,7 @@ function hookPreToolUse(input) {
     const blocks = [];
     // potentialCommit treats a command as leading to a commit. uncertainShell
     // was too broad: it flagged any pipe, so a benign read-only pipeline
-    // (gh ... | tail) was scanned and denied as if it staged a secret.
+    // (gh ... | tail) was scanned and denied as if it staged a blocked file.
     // opaqueCommitHiding keeps every commit-hiding shape (subshells,
     // substitution, script-feeds, code-executing/unlisted pipe segments) while
     // excluding pipelines of known read-only commands.
@@ -503,8 +523,8 @@ function hookPreToolUse(input) {
     // disables the real pre-commit guard, leaving this hook the only check.
     // When the commit also stages files at commit time (-a/--all/-u/--patch, or
     // a preceding `git add`), those files are neither in stagedPaths(repo) now
-    // nor in addPaths, so they were never scanned. Rather than let an unscanned
-    // secret through, deny. (Strict already denied the bypass above.) The rare
+    // nor in addPaths, so they were never scanned. Rather than let unscanned
+    // content through, deny. (Strict already denied the bypass above.) The rare
     // false-positive on an explicit `git add <path> && git commit --no-verify`
     // is safe-side; drop --no-verify to proceed.
     //
@@ -512,7 +532,8 @@ function hookPreToolUse(input) {
     // a --no-verify inside the inner command, where parsed.noVerify cannot see
     // it (the parser only inspects literal argv). Such an uncertain commit is
     // therefore treated as a potential hook bypass for the clean/compliance
-    // secret backstop, so a secret cannot slip past the guard wrapped in eval.
+    // staged-content backstop, so a blocked file cannot slip past the guard
+    // wrapped in eval.
     const indexReplacement = parsed.commands.some((candidate) => (
         candidate.verb === 'commit' && candidate.indexMutationRisk
     ));
@@ -553,9 +574,9 @@ function hookPreToolUse(input) {
     }
     // clean / compliance: advisory only (the git pre-commit unstage is the real
     // enforcement) — except when --no-verify/core.hooksPath bypasses that hook.
-    // A bypassed guard is the one case clean cannot delegate to git, so a blocked
-    // secret is denied here, matching the documented "secret stops the commit when
-    // automatic unstaging fails"; hygiene findings stay advisory.
+    // A bypassed guard is the one case clean cannot delegate to git, so a
+    // secret-category finding (a local rule pack can still declare one) is
+    // denied here; hygiene findings stay advisory.
     const bypassed = Boolean(potentialCommit && hiddenBypass);
     if (bypassed && blocks.some((f) => f.category === 'secret')) {
         return emitDecision(

package/src/report.mjs

@@ -7,33 +7,6 @@
 // for the rest. The JSON report (aimhooman review / --json) is never capped.
 const HUMAN_FINDING_CAP = 20;
 
-// UT-06: prefix -> provider for secret.provider-token findings. The rule packs
-// every provider into one pattern set (rules/secrets.json), so the provider
-// name is recovered from the raw matched line at report time — before the
-// redaction below runs. Only the label is ever rendered, never the token.
-// Mirrors the rule's patterns; keep the rule's alternation order.
-const TOKEN_PROVIDERS = [
-    ['ghp_', 'GitHub'], ['gho_', 'GitHub'], ['ghu_', 'GitHub'], ['ghs_', 'GitHub'],
-    ['ghr_', 'GitHub'], ['github_pat_', 'GitHub'],
-    ['glpat-', 'GitLab'],
-    ['npm_', 'npm'],
-    ['xoxb-', 'Slack'], ['xoxp-', 'Slack'], ['xoxa-', 'Slack'], ['xoxr-', 'Slack'], ['xoxs-', 'Slack'],
-    ['sk-ant-', 'Anthropic'],
-    ['sk-proj-', 'OpenAI'],
-    ['AIza', 'Google'],
-    ['sk_live_', 'Stripe'], ['rk_live_', 'Stripe'],
-    ['hf_', 'Hugging Face'],
-    ['SG.', 'SendGrid'],
-];
-
-function tokenProvider(text) {
-    if (!text) return undefined;
-    for (const [prefix, provider] of TOKEN_PROVIDERS) {
-        if (text.includes(prefix)) return provider;
-    }
-    return undefined;
-}
-
 export function human(findings, tone) {
     if (!findings.length) return '';
     let out = tone === 'professional' ? '\n' : '\nnot very hooman.\n\n';
@@ -56,14 +29,7 @@ export function human(findings, tone) {
         const related = (f.matchedRuleIds || []).filter((id) => id !== f.ruleId);
         const identity = related.length ? `${f.ruleId} (+ ${related.join(', ')})` : f.ruleId;
         const commit = f.commit ? ` [commit ${String(f.commit).slice(0, 12)}]` : '';
-        // UT-06: a provider-token finding used to say only "a provider access
-        // token", leaving the developer to guess which credential to revoke.
-        // Name the provider in the reason; the token itself stays redacted.
-        const provider = f.ruleId === 'secret.provider-token' ? tokenProvider(f.text) : undefined;
-        const reason = provider
-            ? f.reason.replace('provider access token', `provider access token (${provider})`)
-            : f.reason;
-        out += `${f.decision.toUpperCase().padEnd(6)} ${identity}${commit}\n       ${loc}\n       ${reason}\n`;
+        out += `${f.decision.toUpperCase().padEnd(6)} ${identity}${commit}\n       ${loc}\n       ${f.reason}\n`;
         if (f.text && f.text.trim()) {
             out += `       > ${isSensitive(f) ? '[redacted]' : visible(f.text.trim())}\n`;
         }
@@ -111,13 +77,22 @@ export function jsonReport(findings, metadata = {}) {
     return JSON.stringify({ schema_version: 1, ...metadata, findings: safe }, null, 2);
 }
 
+// Built-in secret scanning is gone, but a local rule pack can still declare
+// category "secret"; findings from such a rule keep their matched text out of
+// every report, the same courtesy the built-in rules got.
 function isSensitive(finding) {
     return finding?.category === 'secret'
         || finding?.matchedRules?.some((match) => match.category === 'secret') === true;
 }
 
 // Exit codes: 0 clean, 10 blocked, 11 review required, 31 incomplete scan.
-export function exitCode(findings, profile, complete = true) {
+// An incomplete scan stops the operation only where no later guard can vouch
+// for the skipped content: on the strict profile, or when the caller is the
+// final ref boundary (failClosedIncomplete). Frictionless profiles warn and
+// continue — the reference-transaction guard still scans introduced commits
+// with failClosedIncomplete set, so the skipped content is checked before any
+// ref moves.
+export function exitCode(findings, profile, complete = true, { failClosedIncomplete = false } = {}) {
     let block = false;
     let review = false;
     for (const f of findings) {
@@ -125,7 +100,7 @@ export function exitCode(findings, profile, complete = true) {
         else if (f.decision === 'review') review = true;
     }
     if (block) return 10;
-    if (!complete) return 31;
+    if (!complete && (profile === 'strict' || failClosedIncomplete)) return 31;
     if (review && findings.some((finding) => (finding.scanProfile || profile) !== 'clean')) return 11;
     return 0;
 }

package/src/scan-session.mjs

@@ -52,10 +52,10 @@ export function scanEntries(repo, engine, entries, options = {}) {
     }
 
     // Oversized files: probe the first 8 KB to separate binary from text.
-    // A binary file (PSD, WOFF, PNG) can't hide text-pattern secrets that
-    // the full content scan would find, so it skips as 'binary' (complete).
-    // A text file that exceeds the budget is a genuine 'size-limit' skip
-    // (incomplete) and the caller must raise the limit to cover it.
+    // A binary file (PSD, WOFF, PNG) holds no text lines the content rules
+    // could match, so it skips as 'binary' (complete). A text file that
+    // exceeds the budget is a genuine 'size-limit' skip (incomplete) and the
+    // caller must raise the limit to cover it.
     // Cap probing at 16 MiB: cat-file --batch reads the full blob into memory,
     // so probing a 500 MB file just to check for NULs is wasteful. Files above
     // the cap are classified as size-limit without probing.
@@ -100,25 +100,18 @@ export function scanEntries(repo, engine, entries, options = {}) {
         // Binary detection still reads the blob. Count every examined byte so
         // later commits cannot reset the total budget merely by using NUL data.
         stats.bytes_scanned += blob.length;
-        let matched;
         if (isBinary(blob)) {
+            // Content rules match text lines, so a binary blob carries nothing
+            // they could fire on. Skipping it loses no coverage: the skip is
+            // recorded as 'binary', which does not mark the scan incomplete.
             increment(stats.skipped, 'binary');
             appendPath(stats.skippedPaths, 'binary', entry.path, blob.length);
-            // Binary classification only skips text-oriented policy rules. Secret
-            // signatures are ASCII byte sequences, so latin1 preserves a
-            // one-byte-to-one-code-unit view and keeps the existing byte limits.
-            // Stripping NULs is what defeats hiding credential material behind
-            // them: one injected NUL breaks a signature, and a multi-byte
-            // encoding like UTF-16 injects one per character.
-            matched = engine.checkContent(entry.path, blob.toString('latin1').replace(/\0/g, ''), {
-                categories: ['secret'],
-            });
-        } else {
-            stats.files_scanned += 1;
-            const ranges = lineRanges.get(entry.path);
-            matched = engine.checkContent(entry.path, blob.toString('utf8'),
-                ranges && ranges.length ? { lineRanges: ranges } : {});
+            continue;
         }
+        stats.files_scanned += 1;
+        const ranges = lineRanges.get(entry.path);
+        const matched = engine.checkContent(entry.path, blob.toString('utf8'),
+            ranges && ranges.length ? { lineRanges: ranges } : {});
         stats.findings_total += matched.length;
         for (const finding of matched) {
             if (findings.length >= limits.maxFindings) continue;
@@ -253,8 +246,8 @@ function isBinary(buffer) {
 //
 // Entries without commit/parents (tracked snapshots, staged views, root
 // commits) are omitted from the map; the caller treats a missing key as "scan
-// the whole blob" — the safe side for a secret scanner is to scan MORE, not
-// less, so a failure to compute hunks falls back to the pre-W4 behaviour.
+// the whole blob" — the safe side is to scan MORE, not less, so a failure to
+// compute hunks falls back to the pre-W4 behaviour.
 function collectLineRanges(repo, entries) {
     // Group text-candidate entries by their first parent to batch the diffs.
     // Key by `${commit}\0${parent}` so a merge with multiple parents produces

package/src/scan-target.mjs

@@ -389,8 +389,8 @@ function scanEntryGroup(repo, engine, entries, policy, accumulator, options = {}
     // Content scanning can target a narrower set than the path check. When
     // contentEntries is provided (e.g. only changed files in a commit), read
     // blobs only for those entries instead of the full snapshot. Path-based
-    // rules already ran on the full tree above, so secrets like .env are still
-    // caught even when their blob isn't re-read.
+    // rules already ran on the full tree above, so a path-only finding still
+    // fires even when its blob isn't re-read.
     const contentScannable = (options.contentEntries ?? entries)
         .filter((entry) => entry.status !== 'D' && entry.type !== 'deleted');
     const remaining = accumulator.remaining();
@@ -405,14 +405,14 @@ function scanEntryGroup(repo, engine, entries, policy, accumulator, options = {}
 function scanReviewPathChanges(engine, entries, policy, accumulator, options = {}) {
     for (const entry of entries) {
         // A deleted path is gone, so only structural policy rules (agent
-        // instructions, project policy) can still matter: deleting a secret or a
-        // session file is hygiene, not a violation. A renamed-away path is
-        // different — its content survives under a new name, so a path-only
-        // secret (e.g. .env) must still fire or a `git mv` to a neutral name
-        // would slip past the destination scan, which only catches content-shaped
-        // secrets. That finding is reported on the destination path (where the
-        // bytes now live) so clean-profile repair unstages the blob that carries
-        // the secret rather than the old name.
+        // instructions, project policy) can still matter: deleting a flagged
+        // file is hygiene, not a violation. A renamed-away path is different —
+        // its content survives under a new name, so a path-only secret-category
+        // rule from a local pack must still fire or a `git mv` to a neutral
+        // name would slip past the destination scan, which only catches
+        // content-shaped matches. That finding is reported on the destination
+        // path (where the bytes now live) so clean-profile repair unstages the
+        // blob that carries the match rather than the old name.
         const deleted = entry.status === 'D' || entry.type === 'deleted';
         const renamed = entry.status === 'R' && entry.sourcePath && entry.sourcePath !== entry.path;
         if (!deleted && !renamed) continue;