eae758771f
ROOT CAUSE (post-mortem at docs/reports/TIER2_MCP_REGRESSION_20260624.md): - Tier 1 asserted claims from old reports without re-verifying (SSDL campaign was designed from a static text string '6 nil-check functions' in src/code_path_audit_gen.py:108 that was never a runtime measurement) - Tier 2 (autonomous) made an empty fix commit (2b7e2de1) for the MCP regression; the pre-commit hook silently stripped opencode.json + mcp_paths.toml and the agent reported success without verifying with 'git show HEAD --stat' - Both happened because neither tier read the critical files before acting THE FIX (this commit): 1. .agents/agents/tier1-orchestrator.md: add MANDATORY pre-action reading list (6 files: AGENTS.md, conductor/workflow.md, current track spec/plan, the 3 code_styleguides). Reference the 2026-06-24 SSDL failures. 2. .agents/agents/tier2-tech-lead.md: add MANDATORY pre-action reading list (8 files: AGENTS.md, workflow.md, edit_workflow.md, the githooks forbidden-files.txt, the tier2_leak_prevention spec, the 3 styleguides) + the MANDATORY pre-commit verification gate (3 checks per commit). 3. .agents/agents/tier3-worker.md: add 4-file read list (AGENTS.md, task spec, relevant styleguide, the actual code being modified). Tier 3 doesn't need the full 8-file list — Tier 2's task spec is the contract. 4. .agents/agents/tier4-qa.md: same 4-file read list (analysis context). 5. conductor/tier2/agents/tier2-autonomous.md: add the 8-file MANDATORY pre-action reading list + the MANDATORY pre-commit verification gate. 6. conductor/tier2/commands/tier-2-auto-execute.md: add the 8-file list to the pre-flight section (step 0). 7. conductor/tier2/githooks/pre-commit: change behavior from 'silent strip + commit anyway' to 'strip + ABORT commit with diagnostic message'. The previous behavior led to empty commits (the 2026-06-24 regression). The agent MUST investigate the leak before retrying the commit. ENFORCEMENT (all tiers): - First commit of any track must include 'TIER-N READ <list> before <task>' in the commit message. The failcount contract treats an unacknowledged first commit as a red-phase failure (per the error_handling.md Rule #0 precedent). NOT IN THIS COMMIT (deferred to followup tracks per the post-mortem): - Rule 4 (CI gate for required files via scripts/audit_branch_required_files.py) - AGENTS.md addition of the canonical 'MANDATORY Pre-Action Reading' section (separate track to ensure the project-root rules reflect the same list) - Cross-platform agent files (.opencode/, .claude/, .gemini/) — those are generated from the canonical .agents/agents/ files; this commit updates the canonical sources. 7 files modified, 109 insertions, 6 deletions.
107 lines
4.5 KiB
Bash
107 lines
4.5 KiB
Bash
#!/bin/sh
|
|
# Tier 2 autonomous mode: prevent sandbox-only file leaks.
|
|
#
|
|
# setup_tier2_clone.ps1 modifies opencode.json and mcp_paths.toml in the
|
|
# clone (C:\projects\manual_slop_tier2\), and copies the tier-2 agent
|
|
# prompt + slash command from conductor/tier2/ into .opencode/. If a
|
|
# tier-2 commit captures any of these via `git add .`, the main repo
|
|
# would absorb the sandbox's local config drift.
|
|
#
|
|
# This hook runs on `git commit` in the tier-2 clone. It reads the
|
|
# denylist from conductor/tier2/githooks/forbidden-files.txt and
|
|
# auto-unstages any staged file whose path contains a forbidden
|
|
# substring. The commit then proceeds with only the legitimate work.
|
|
#
|
|
# Layer 1 (OpenCode permission system) blocks the tier-2 agent from
|
|
# editing these files directly. This hook is the backup layer at the
|
|
# commit boundary. Layer 3 is the audit script
|
|
# scripts/audit_tier2_leaks.py in the main repo.
|
|
#
|
|
# Why auto-unstage instead of exit 1: tier-2 cannot run `git restore
|
|
# --staged` (banned by the sandbox permission rules), so a hard reject
|
|
# would leave the agent stuck mid-flow. Auto-unstage + warn is the
|
|
# recoverable behavior.
|
|
#
|
|
# Why exit 0 always: the hook must never block the agent. Its job is to
|
|
# remove the leak, not to gate the commit. The failcount machinery in
|
|
# scripts/tier2/failcount.py tracks repeated red-phase failures and
|
|
# gives up the run; adding a hook-induced exit 1 would pollute that
|
|
# signal.
|
|
|
|
CONFIG="conductor/tier2/githooks/forbidden-files.txt"
|
|
|
|
if [ ! -f "$CONFIG" ]; then
|
|
exit 0
|
|
fi
|
|
|
|
# POSIX shells cannot store NUL bytes in variables (command substitution
|
|
# strips them). So we cannot do `STAGED=$(git diff -z)` and iterate.
|
|
# Instead, pipe `git diff -z` into a `while read -d ''` loop in a
|
|
# subshell, and write leaked paths to a temp file. The parent shell then
|
|
# reads the temp file and unstages via `git rm --cached`.
|
|
TMPFILE="./.tier2_leaked_$$"
|
|
trap 'rm -f "$TMPFILE" 2>/dev/null' EXIT
|
|
|
|
# Check if any staged file matches any forbidden substring.
|
|
# Pattern matching strategy: for each staged file, iterate the config
|
|
# file's non-comment, non-blank lines. Each pattern is a substring to
|
|
# look for in the file path. `case "$f" in *"$pattern"*)` is faster
|
|
# than spawning `grep` per file.
|
|
#
|
|
# CRITICAL: the config file may have CRLF line endings (the test writes
|
|
# it via Python's text mode on Windows). Strip trailing \r from each
|
|
# pattern before matching, otherwise `*pattern*` will not match a
|
|
# clean path because the pattern contains a stray carriage return.
|
|
git diff --cached --name-only -z | while IFS= read -r -d '' f; do
|
|
[ -z "$f" ] && continue
|
|
while IFS= read -r pattern || [ -n "$pattern" ]; do
|
|
# Strip trailing \r (CRLF line endings on Windows)
|
|
pattern=$(printf '%s' "$pattern" | tr -d '\r')
|
|
case "$pattern" in
|
|
''|'#'*) continue ;;
|
|
esac
|
|
case "$f" in
|
|
*"$pattern"*)
|
|
printf '%s\n' "$f" >> "$TMPFILE"
|
|
break
|
|
;;
|
|
esac
|
|
done < "$CONFIG"
|
|
done
|
|
|
|
if [ ! -s "$TMPFILE" ]; then
|
|
exit 0
|
|
fi
|
|
|
|
# Auto-unstages the leak. Then ABORTS the commit so the agent MUST investigate
|
|
# before retrying. The previous behavior (silent strip + commit) led to the
|
|
# 2026-06-24 MCP regression where Tier 2 made an empty fix commit (2b7e2de1)
|
|
# and reported success without verifying.
|
|
while IFS= read -r f; do
|
|
[ -z "$f" ] && continue
|
|
echo " - unstaging: $f" >&2
|
|
# `git rm --cached` works on tracked files (unstages modifications)
|
|
# AND on newly-added files (unstages the addition, file becomes
|
|
# untracked again). NOT `git restore` (banned in sandbox).
|
|
#
|
|
# `--force` is required when the index has content that differs from
|
|
# BOTH HEAD and the working tree (e.g., the file was modified,
|
|
# staged, then modified again in the working tree). Without
|
|
# --force, git refuses to discard the staged content.
|
|
git rm --cached --quiet --force "$f" 2>/dev/null || true
|
|
done < "$TMPFILE"
|
|
|
|
echo "" >&2
|
|
echo "Tier 2: COMMIT ABORTED — sandbox file leak detected." >&2
|
|
echo "" >&2
|
|
echo "The pre-commit hook auto-unstaged the leaked files (see list above)," >&2
|
|
echo "but the commit is aborted to prevent the 2026-06-24 empty-commit" >&2
|
|
echo "regression. Investigate why these files were staged:" >&2
|
|
echo " (1) Did you accidentally run \`git add .\`? Use \`git add <specific_files>\`" >&2
|
|
echo " (2) Did the files leak from setup_tier2_clone.ps1? Check \`git status\`." >&2
|
|
echo " (3) Are the files intentionally part of your work? Re-stage them with" >&2
|
|
echo " \`git add <path>\` after confirming they're NOT in forbidden-files.txt." >&2
|
|
echo "" >&2
|
|
echo "Re-attempt the commit after resolving the leak." >&2
|
|
|
|
exit 1 |